libdrm: Upgrade 2.4.207.imx -> 2.4.109.imx

This is a pre-release version from upcoming NXP Q2 release added to
kirkstone to fix mesa compatibility problems. The patch
0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch is dropped
as it is now upstream.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>

2 files changed, 6 insertions, 7 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index c3c1604f..46726f53 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -425,9 +425,9 @@ PREFERRED_VERSION_wayland-protocols:mx7-nxp-bsp ?= "1.22.imx"
 PREFERRED_VERSION_wayland-protocols:mx8-nxp-bsp ?= "1.22.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.107.imx"
-PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.107.imx"
-PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.107.imx"
+PREFERRED_VERSION_libdrm:mx6-nxp-bsp ?= "2.4.109.imx"
+PREFERRED_VERSION_libdrm:mx7-nxp-bsp ?= "2.4.109.imx"
+PREFERRED_VERSION_libdrm:mx8-nxp-bsp ?= "2.4.109.imx"
 
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ?= "3.15.0.imx"
diff --git a/recipes-graphics/drm/libdrm_2.4.107.imx.bb b/recipes-graphics/drm/libdrm_2.4.109.imx.bb
index b732e82a..6a9ab254 100644
--- a/recipes-graphics/drm/libdrm_2.4.107.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.109.imx.bb
@@ -11,10 +11,9 @@ PROVIDES = "drm"
 DEPENDS = "libpthread-stubs"
 
 IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1"
-IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.107"
-SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \
-           file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch "
-SRCREV = "a7316e7d67b7708f40ffe469858dae07f14fe21a"
+SRCBRANCH ?= "libdrm-imx-2.4.109"
+SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
+SRCREV = "1d943abb1fccc350a129950d2690948f64503bb7"
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"