[PATCH 0/3] Add AM3 and AM4 which use null_window DRM

[PATCH 0/3] Add AM3 and AM4 which use null_window DRM

[Hongmei Gou]

Add AM3 and AM4 which use null_window DRM from SGX DDK.

The kernel module ompadrm-pvr in this patch is built with Eric's version 1 kernel patches

Hongmei Gou (3):
  omapdrm-pvr: add AM3 and AM4 which use null_window DRM
  omap5-sgx-ddk-um-linux: add AM3 and AM4, and pvr-init to
    initialization
  libdrm: add ti33x and ti43x to COMPATIBLE_MACHINE

 .../powervr-drivers/omapdrm-pvr_1.9.2253347.bb     | 28 ++++++++++++++----
 recipes-graphics/drm/libdrm_2.4.41.bb              |  4 +--
 .../libgles/omap5-sgx-ddk-um-linux/dummy.ini       |  0
 .../libgles/omap5-sgx-ddk-um-linux/powervr.ini     |  3 ++
 .../libgles/omap5-sgx-ddk-um-linux/rc.pvr          | 17 +++++++++++
 .../libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb     | 33 ++++++++++++++++++++--
 6 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 recipes-graphics/libgles/omap5-sgx-ddk-um-linux/dummy.ini
 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

-- 
1.9.1

[PATCH 1/3] omapdrm-pvr: add AM3 and AM4 which use null_window DRM

[Hongmei Gou]

Signed-off-by: Hongmei Gou <h-gou@ti.com>
---
 .../powervr-drivers/omapdrm-pvr_1.9.2253347.bb     | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb b/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
index 665c3de..c99bd8b 100644
--- a/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
+++ b/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
@@ -3,24 +3,40 @@ HOMEPAGE = "http://git.ti.com"
 LICENSE = "MIT | GPLv2"
 LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=2b841bfc03386bb4d8d9381b79d33898"
 
-inherit module
+inherit module pkgconfig
+
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
 
 MACHINE_KERNEL_PR_append = "g"
 PR = "${MACHINE_KERNEL_PR}"
 
-BRANCH = "dra7/k4.1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BRANCH_omap-a15 = "dra7/k4.1"
+BRANCH_ti33x = "am4/k4.1"
+BRANCH_ti43x = "am4/k4.1"
 
 SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
 S = "${WORKDIR}/git"
 
-SRCREV = "333ef031a98c0abdd49b6cfac61fbdd8c1d88518"
+SRCREV_omap-a15 = "333ef031a98c0abdd49b6cfac61fbdd8c1d88518"
+SRCREV_ti33x = "5b26357ef6243e65d431be380103a692bbdce309"
+SRCREV_ti43x = "5b26357ef6243e65d431be380103a692bbdce309"
+
+PVR_NULLDRM_ti33x = "1"
+PVR_NULLDRM_ti43x = "1"
+PVR_NULLDRM_omap-a15 = "0"
+
+EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" PVR_NULLDRM=${PVR_NULLDRM}'
 
-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}"'
+DEVICE_SUB_DIR_omap-a15 = "omap5430"
+DEVICE_SUB_DIR_ti33x = "omap335x"
+DEVICE_SUB_DIR_ti43x = "omap437x"
 
 do_compile_prepend() {
-    cd ${S}/eurasia_km/eurasiacon/build/linux2/omap5430_linux
+    cd ${S}/eurasia_km/eurasiacon/build/linux2/${DEVICE_SUB_DIR}_linux
 }
 
 do_install() {
-    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_omap5430_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
+    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_${DEVICE_SUB_DIR}_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
 }
-- 
1.9.1

Re: [PATCH 1/3] omapdrm-pvr: add AM3 and AM4 which use null_window DRM

[Denys Dmytriyenko]

On Thu, Aug 27, 2015 at 11:16:07PM -0400, Hongmei Gou wrote:
> Signed-off-by: Hongmei Gou <h-gou@ti.com>
> ---
>  .../powervr-drivers/omapdrm-pvr_1.9.2253347.bb     | 28 +++++++++++++++++-----
>  1 file changed, 22 insertions(+), 6 deletions(-)
> 
> diff --git a/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb b/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
> index 665c3de..c99bd8b 100644
> --- a/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
> +++ b/recipes-bsp/powervr-drivers/omapdrm-pvr_1.9.2253347.bb
> @@ -3,24 +3,40 @@ HOMEPAGE = "http://git.ti.com"
>  LICENSE = "MIT | GPLv2"
>  LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=2b841bfc03386bb4d8d9381b79d33898"
>  
> -inherit module
> +inherit module pkgconfig

Why do you need pkgconfig here?

The rest looks good, but we need to bump SRCREV for omap5/dra7 - see my other 
patch...


> +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
>  
>  MACHINE_KERNEL_PR_append = "g"
>  PR = "${MACHINE_KERNEL_PR}"
>  
> -BRANCH = "dra7/k4.1"
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +BRANCH_omap-a15 = "dra7/k4.1"
> +BRANCH_ti33x = "am4/k4.1"
> +BRANCH_ti43x = "am4/k4.1"
>  
>  SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}"
>  S = "${WORKDIR}/git"
>  
> -SRCREV = "333ef031a98c0abdd49b6cfac61fbdd8c1d88518"
> +SRCREV_omap-a15 = "333ef031a98c0abdd49b6cfac61fbdd8c1d88518"
> +SRCREV_ti33x = "5b26357ef6243e65d431be380103a692bbdce309"
> +SRCREV_ti43x = "5b26357ef6243e65d431be380103a692bbdce309"
> +
> +PVR_NULLDRM_ti33x = "1"
> +PVR_NULLDRM_ti43x = "1"
> +PVR_NULLDRM_omap-a15 = "0"
> +
> +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" PVR_NULLDRM=${PVR_NULLDRM}'
>  
> -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}"'
> +DEVICE_SUB_DIR_omap-a15 = "omap5430"
> +DEVICE_SUB_DIR_ti33x = "omap335x"
> +DEVICE_SUB_DIR_ti43x = "omap437x"
>  
>  do_compile_prepend() {
> -    cd ${S}/eurasia_km/eurasiacon/build/linux2/omap5430_linux
> +    cd ${S}/eurasia_km/eurasiacon/build/linux2/${DEVICE_SUB_DIR}_linux
>  }
>  
>  do_install() {
> -    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_omap5430_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
> +    make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary2_${DEVICE_SUB_DIR}_linux_release/target/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
>  }
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti

[PATCH 2/3] omap5-sgx-ddk-um-linux: add AM3 and AM4, and pvr-init to initialization

[Hongmei Gou]

* 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>
---
 .../libgles/omap5-sgx-ddk-um-linux/dummy.ini       |  0
 .../libgles/omap5-sgx-ddk-um-linux/powervr.ini     |  3 ++
 .../libgles/omap5-sgx-ddk-um-linux/rc.pvr          | 17 +++++++++++
 .../libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb     | 33 ++++++++++++++++++++--
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 recipes-graphics/libgles/omap5-sgx-ddk-um-linux/dummy.ini
 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

diff --git a/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/dummy.ini b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/dummy.ini
new file mode 100644
index 0000000..e69de29
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 0000000..0657ab8
--- /dev/null
+++ b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux/powervr.ini
@@ -0,0 +1,3 @@
+[default]
+WindowSystem=null_libdrm.so
+DisableHWTQTextureUpload=1
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 0000000..2711d6b
--- /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_1.9.0.12.bb b/recipes-graphics/libgles/omap5-sgx-ddk-um-linux_1.9.0.12.bb
index c29b91d..0509250 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"
+
+INITSCRIPT_NAME = "pvr-init"
+INITSCRIPT_PARAMS = "defaults 30"
+
+inherit update-rc.d
 
-PR = "r9"
+PR = "r10"
 PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 
 RREPLACES_${PN} = "libegl libgles1 libgles2"
@@ -17,13 +28,29 @@ RREPLACES_${PN}-dbg = "libegl-dbg"
 
 S = "${WORKDIR}/git"
 
+PVR_INI_FILE_omap-a15 = "dummy.ini"
+PVR_INI_FILE_ti33x = "powervr.ini"
+PVR_INI_FILE_ti43x = "powervr.ini"
+
+SRC_URI_append = " \
+    file://rc.pvr \
+    file://${PVR_INI_FILE} \
+"
+
 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}/${PVR_INI_FILE} ${D}${sysconfdir}/powervr.ini
 }
 
 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"
 
-- 
1.9.1

[PATCH 3/3] libdrm: add ti33x and ti43x to COMPATIBLE_MACHINE

[Hongmei Gou]

Signed-off-by: Hongmei Gou <h-gou@ti.com>
---
 recipes-graphics/drm/libdrm_2.4.41.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/drm/libdrm_2.4.41.bb b/recipes-graphics/drm/libdrm_2.4.41.bb
index 0150632..dc1fbe1 100644
--- a/recipes-graphics/drm/libdrm_2.4.41.bb
+++ b/recipes-graphics/drm/libdrm_2.4.41.bb
@@ -2,7 +2,7 @@ require recipes-graphics/drm/libdrm.inc
 
 FILESEXTRAPATHS_append := ":${COREBASE}/meta/recipes-graphics/drm/libdrm"
 
-COMPATIBLE_MACHINE = "omap-a15"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,6 +15,6 @@ SRC_URI += "file://installtests-ti.patch \
             file://GNU_SOURCE_definition.patch \
            "
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 S = "${WORKDIR}/git"
-- 
1.9.1

Re: [PATCH 3/3] libdrm: add ti33x and ti43x to COMPATIBLE_MACHINE

[Denys Dmytriyenko]

Hongmei, Karthik, Nikhil,

Ok, this is not going to scale. Why do we still use an ancient (2.5yo) version 
of libdrm? As far as I can see, this fork only has couple own patches (test 
enablement and debianization) and few more backports from upstream.

Please, extract the relevant patches (just kmstest AFAICS) and apply it/them 
to the latest available upstream version of libdrm. This old version was once 
a short-term exception to dra7 platform, but with this change it now becomes 
the default and it has to be done properly then.

-- 
Denys


On Thu, Aug 27, 2015 at 11:16:09PM -0400, Hongmei Gou wrote:
> Signed-off-by: Hongmei Gou <h-gou@ti.com>
> ---
>  recipes-graphics/drm/libdrm_2.4.41.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-graphics/drm/libdrm_2.4.41.bb b/recipes-graphics/drm/libdrm_2.4.41.bb
> index 0150632..dc1fbe1 100644
> --- a/recipes-graphics/drm/libdrm_2.4.41.bb
> +++ b/recipes-graphics/drm/libdrm_2.4.41.bb
> @@ -2,7 +2,7 @@ require recipes-graphics/drm/libdrm.inc
>  
>  FILESEXTRAPATHS_append := ":${COREBASE}/meta/recipes-graphics/drm/libdrm"
>  
> -COMPATIBLE_MACHINE = "omap-a15"
> +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
>  
>  DEFAULT_PREFERENCE = "-1"
>  
> @@ -15,6 +15,6 @@ SRC_URI += "file://installtests-ti.patch \
>              file://GNU_SOURCE_definition.patch \
>             "
>  
> -PR = "${INC_PR}.1"
> +PR = "${INC_PR}.2"
>  
>  S = "${WORKDIR}/git"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti