From 71b8450f9b954054165711781023b384433c065e Mon Sep 17 00:00:00 2001
From: Karthik Ramanan <a0393906@ti.com>
Date: Thu, 10 Nov 2016 16:51:08 +0530
Subject: [PATCH] dra7xx-evm: add support for graphics acceleration

TI Jacinto 6 has a 3D GPU that can used to accelerate the graphics
processing requests. This patch replaces the default graphics
drivers and user space libraries only for the dra7xx-evm MACHINE

Change-Id: I1a53594f0fa4dc8fabd16f9ce2c765dd32b9e142
Signed-off-by: Karthik Ramanan <a0393906@ti.com>
---
 .../recipes-graphics/mesa/mesa-gl_%.bbappend       |  7 +++++++
 .../force-type-conversion.patch                    | 13 ++++++++++++
 .../wayland/wayland-ivi-extension_1.9.1.bbappend   |  5 +++++
 templates/machine/dra7xx-evm/50_local.conf.inc     | 24 ++++++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend
 create mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch
 create mode 100644 meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend

diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend
new file mode 100644
index 000000000..a5a69513a
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -0,0 +1,7 @@
+# Remove GBM support from Mesa
+# TI Platforms provides own GBM library
+
+PACKAGES_remove = "libgbm"
+PACKAGES_remove = "libgbm-dev"
+
+EXTRA_OECONF_remove = "--enable-gbm"
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch
new file mode 100644
index 000000000..a72aeedf6
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch
@@ -0,0 +1,13 @@
+diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
+index 2e65864..e14dbc0 100644
+--- a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
++++ b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp
+@@ -244,7 +247,7 @@ bool OpenGLES2App::createEGLContext()
+     m_eglContextStruct.eglSurface = NULL;
+     m_eglContextStruct.eglContext = NULL;
+ 
+-    m_eglContextStruct.eglDisplay = eglGetDisplay(m_wlContextStruct.wlDisplay);
++    m_eglContextStruct.eglDisplay = eglGetDisplay((EGLNativeDisplayType)m_wlContextStruct.wlDisplay);
+     eglstatus = eglGetError();
+     if (!m_eglContextStruct.eglDisplay)
+     {
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend
new file mode 100644
index 000000000..e9a57d324
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/wayland-ivi-extension_1.9.1.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+
+SRC_URI_append = "\
+    file://force-type-conversion.patch \
+    "
diff --git a/templates/machine/dra7xx-evm/50_local.conf.inc b/templates/machine/dra7xx-evm/50_local.conf.inc
index adf577e8b..05a15c971 100644
--- a/templates/machine/dra7xx-evm/50_local.conf.inc
+++ b/templates/machine/dra7xx-evm/50_local.conf.inc
@@ -1,5 +1,29 @@
 MACHINE = "dra7xx-evm"
 
+PACKAGES_GFX_${MACHINE} = "omapdrm-pvr"
+
+# Enable Gfx Pkgs
+MACHINE_FEATURES_append = " sgx"
+MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
+
+DEPENDS_remove = "virtual/libgl"
+
+# Preferred providers
+PREFERRED_PROVIDER_virtual/libgles1 = ""
+PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/egl      = "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/mesa     = "mesa-gl"
+PREFERRED_PROVIDER_libgbm           = "libgbm"
+
+#Preferred versions
+PREFERRED_VERSION_libgbm            = "10.0.0"
+
+
+# Distribution-specific runtime components
+IMAGE_INSTALL_append = " \
+     ${PACKAGES_GFX}     \
+"
+
 ## ATTENTION, this is needed right now to build meta-ti with AGL: ##
 ## due to meta-ti being based on YP 1.8 instead of YP 2.0
 BBMASK  = "meta-ti/.*eudev"
-- 
2.16.6