From 990ec30a581886d97caa96b436858cab7130197a Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Tue, 23 Oct 2018 14:54:07 -0500
Subject: [PATCH] libdrm: Upgrade to 2.4.91.imx

Fixes minimum version for xserver-xorg.

Includes patch fuzz fix for:

0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 ...low-explicit-enabling-of-cunit-tests.patch | 24 +++++++++----------
 ...drm_2.4.84.imx.bb => libdrm_2.4.91.imx.bb} |  7 +++---
 2 files changed, 14 insertions(+), 17 deletions(-)
 rename recipes-graphics/drm/{libdrm_2.4.84.imx.bb => libdrm_2.4.91.imx.bb} (96%)

diff --git a/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
index bf526370..fa7b218e 100644
--- a/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
+++ b/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
@@ -1,22 +1,23 @@
-From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001
+From 9be904a70e6b7e6b3cc4e1b270bca02d14a4179b Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Mon, 5 Sep 2016 14:41:37 +0300
-Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests
+Subject: [PATCH] configure.ac: Allow explicit enabling of cunit tests
 
 Add --with-cunit to make it easier to do reproducible builds. Default
 is still to probe cunit and build opportunistically.
 
 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Upstream-Status: Submitted [mailing list]
+
 ---
  configure.ac | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index e3048c7..918d21d 100644
+index 1341f51..bef46e0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -137,6 +137,12 @@ AC_ARG_ENABLE(install-test-programs,
+@@ -168,6 +168,12 @@ AC_ARG_ENABLE(install-test-programs,
  		  [Install test programs (default: no)]),
  		  [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no])
  
@@ -29,8 +30,8 @@ index e3048c7..918d21d 100644
  dnl ===========================================================================
  dnl check compiler flags
  AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
-@@ -372,7 +378,7 @@ if test "x$RADEON" = xyes; then
- 	AC_DEFINE(HAVE_RADEON, 1, [Have radeon support])
+@@ -416,7 +422,7 @@ else
+ 	AC_DEFINE(HAVE_RADEON, 0)
  fi
  
 -if test "x$AMDGPU" != xno; then
@@ -38,8 +39,8 @@ index e3048c7..918d21d 100644
  	# Detect cunit library
  	PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
  	# If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
-@@ -399,7 +406,11 @@ if test "x$AMDGPU" = xyes; then
- 	AC_DEFINE(HAVE_CUNIT, [test "x$have_cunit" != "xno"], [Enable CUNIT Have amdgpu support])
+@@ -441,7 +447,11 @@ if test "x$AMDGPU" = xyes; then
+ 	AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support])
  
  	if test "x$have_cunit" = "xno"; then
 -		AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
@@ -49,8 +50,5 @@ index e3048c7..918d21d 100644
 +			AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests])
 +		fi
  	fi
- fi
- 
--- 
-2.1.4
-
+ else
+ 	AC_DEFINE(HAVE_AMDGPU, 0)
diff --git a/recipes-graphics/drm/libdrm_2.4.84.imx.bb b/recipes-graphics/drm/libdrm_2.4.91.imx.bb
similarity index 96%
rename from recipes-graphics/drm/libdrm_2.4.84.imx.bb
rename to recipes-graphics/drm/libdrm_2.4.91.imx.bb
index 317b8f62..b3e8f1e1 100644
--- a/recipes-graphics/drm/libdrm_2.4.84.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.91.imx.bb
@@ -11,14 +11,15 @@ PROVIDES = "drm"
 DEPENDS = "libpthread-stubs libpciaccess"
 
 IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https"
-IMX_LIBDRM_BRANCH = "libdrm-imx-2.4.84"
+IMX_LIBDRM_BRANCH = "libdrm-imx-2.4.91"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \
            file://installtests.patch \
            file://fix_O_CLOEXEC_undeclared.patch \
            file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \
           "
 SRC_URI_remove_mx8 = "file://drm-update-arm.patch"
-SRCREV = "8c8c46d41839035de605291bc1c26902011a74ac"
+SRCREV = "e8e9cf8a66be11508c39f1cc31b8a5e7eb758875"
+S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -61,6 +62,4 @@ RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante"
 
 FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*"
 
-S = "${WORKDIR}/git"
-
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-- 
2.40.1