From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 29 Jun 2018 16:56:17 +0000 (-0300)
Subject: imx-base: Use i.MX's fork of libdrm for i.MX6 and i.MX7
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7f993294c7eef1dd7a34097758d3e904940e51e2;p=meta-freescale.git

imx-base: Use i.MX's fork of libdrm for i.MX6 and i.MX7

There few components which require the new libdrm fork, so we must use
it when using NXP's BSP components. Besides adding the preferred
version we need also to add it to the SoC architecture filter.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 75a3fdf4cb0e3a8bb8a08da0a9a486f541f23124)
---

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 419ab1bc..2a2ead21 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -118,6 +118,7 @@ MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
     virtual/libgles1 \
     virtual/libgles2 \
     virtual/libopenvg \
+    libdrm \
     cairo \
     gstreamer1.0-plugins-bad \
     libgal-imx \
@@ -203,7 +204,7 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx7ulp = "1"
 #   1 - machine has Vivante GPU driver support
 MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}"
 
-# mx6 GPU libraries
+# GPU libraries
 PREFERRED_PROVIDER_virtual/egl_mx6q ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/egl_mx6sx ?= "imx-gpu-viv"
@@ -249,6 +250,10 @@ PREFERRED_PROVIDER_virtual/libg2d_mx7ulp ?= "imx-gpu-viv"
 PREFERRED_VERSION_weston_mx6 ?= "2.0.0"
 PREFERRED_VERSION_weston_mx7 ?= "2.0.0"
 
+# Use i.MX libdrm Version
+PREFERRED_VERSION_libdrm_mx6 ?= "2.4.84.imx"
+PREFERRED_VERSION_libdrm_mx7 ?= "2.4.84.imx"
+
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-imx"
 IMX_DEFAULT_KERNEL_mxs = "linux-fslc"