From 483a8ce22c6c120272f6eeffb4ea7e07aca1bda1 Mon Sep 17 00:00:00 2001
From: "Gou, Hongmei" <h-gou@ti.com>
Date: Sat, 29 Aug 2015 03:07:32 +0000
Subject: [PATCH] omap5-sgx-ddk-um-linux: add AM3 and AM4, and pvr-init to
 initialization

* Add AM3 and AM4 which use null_windown DRM
* Add pvr-init to /etc/init.d

Signed-off-by: Hongmei Gou <h-gou@ti.com>

v2 changes:
1) Use 8 as the initialization number for pvr-init, since pvr-init needs to be done before starting weston which uses number 9
2) Create empty powervr.ini as the default, and place ti33x and ti43x specific ones in their corresponding directories
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../omap5-sgx-ddk-um-linux/powervr.ini        |  0
 .../libgles/omap5-sgx-ddk-um-linux/rc.pvr     | 17 +++++++++++
 .../omap5-sgx-ddk-um-linux/ti33x/powervr.ini  |  3 ++
 .../omap5-sgx-ddk-um-linux/ti43x/powervr.ini  |  3 ++
 .../omap5-sgx-ddk-um-linux_1.9.0.12.bb        | 29 +++++++++++++++++--
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 recipes-graphics/libgles/omap5-sgx-ddk-um-linux/powervr.ini
 create mode 100644 recipes-graphics/libgles/omap5-sgx-ddk-um-linux/rc.pvr
 create mode 100644 recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti33x/powervr.ini
 create mode 100644 recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti43x/powervr.ini

diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/powervr.ini b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/powervr.ini
new file mode 100644
index 00000000..e69de29b
diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/rc.pvr b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/rc.pvr
new file mode 100644
index 00000000..2711d6b7
--- /dev/null
+++ b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/rc.pvr
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+case "$1" in
+  start)
+
+  echo "Initializing the graphics driver ..."
+  pvrsrvinit
+
+  ;;
+  stop)
+    # Nothing to be done.
+  ;;
+  *)
+    echo "Usage: $0 {start|stop}"
+    exit 1
+  ;;
+esac
diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti33x/powervr.ini b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti33x/powervr.ini
new file mode 100644
index 00000000..0657ab87
--- /dev/null
+++ b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti33x/powervr.ini
@@ -0,0 +1,3 @@
+[default]
+WindowSystem=null_libdrm.so
+DisableHWTQTextureUpload=1
diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti43x/powervr.ini b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti43x/powervr.ini
new file mode 100644
index 00000000..0657ab87
--- /dev/null
+++ b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/ti43x/powervr.ini
@@ -0,0 +1,3 @@
+[default]
+WindowSystem=null_libdrm.so
+DisableHWTQTextureUpload=1
diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
index c29b91db..a97f88bf 100644
--- a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
+++ b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
@@ -3,12 +3,23 @@ HOMEPAGE = "http://downloads.ti.com/dsps/dsps_public_sw/gfxsdk"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://OMAP5-Linux-Graphics-DDK-UM-Manifest.doc;md5=360d293df455e4f2d363bb4014a49603"
 
-BRANCH = "master"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BRANCH_omap-a15 = "master"
+BRANCH_ti33x = "am4/k4.1"
+BRANCH_ti43x = "am4/k4.1"
 
 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}"
-SRCREV = "d63cd6469fff610317a8e1c986f227bb3e7922f6"
+SRCREV_omap-a15 = "d63cd6469fff610317a8e1c986f227bb3e7922f6"
+SRCREV_ti33x    = "c30d4b35701e1b88d58a9ae713b2e679298d1a37"
+SRCREV_ti43x    = "c30d4b35701e1b88d58a9ae713b2e679298d1a37"
 
-PR = "r9"
+INITSCRIPT_NAME = "pvr-init"
+INITSCRIPT_PARAMS = "defaults 8"
+
+inherit update-rc.d
+
+PR = "r10"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 
 RREPLACES_${PN} = "libegl libgles1 libgles2"
@@ -17,13 +28,25 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
 
 S = "${WORKDIR}/git"
 
+SRC_URI_append = " \
+    file://rc.pvr \
+    file://powervr.ini \
+"
+
 do_install () {
     oe_runmake install DESTDIR=${D}
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
+
+    install -d ${D}${sysconfdir}
+    install -m 0644 ${WORKDIR}/powervr.ini ${D}${sysconfdir}/
 }
 
 FILES_${PN} =  "${bindir}/*"
 FILES_${PN} += " ${libdir}/*"
 FILES_${PN} +=  "${includedir}/* /usr/share/sgx-lib/"
+FILES_${PN} += "${sysconfdir}/init.d/pvr-init"
+FILES_${PN} += "${sysconfdir}/powervr.ini"
 
 INHIBIT_PACKAGE_STRIP = "1"