All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver
@ 2015-08-22 21:51 Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 1/6] kernel-module-mcc: move to kernel-modules subdir Otavio Salvador
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

This patchset implements support to dynamically choose between
built-in or external Vivante GPU kernel driver.

By default, the external Vivante GPU kernel module is used, however
every machine can have its own choice for this, or distros can
override the default value if needed.

The following options are supported:

  MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT

     Machine does or does not have support for the Vivante kernel
     driver, options are:

       0 - machine does not have Vivante GPU driver support
       1 - machine has Vivante GPU driver support

  MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE

      Machine uses the Vivante kernel driver as module, options are:

       0 - enable the builtin kernel driver module
       1 - enable the external kernel module

The patches included in this patchset are:

Changes in v5:
- Skip package when machine does not have Vivante kernel support
- Add SoC default for kernel support in imx-base.inc

Changes in v4:
- Uses intermediate variable to fix override in machine definition files
- Silence the warning about missing build-dependency

Changes in v3:
- improve class documentation and commit log according to Ann suggestions
- New patch

Changes in v2:
- Improve commit log (Daiane)
- improve commit log and class documentation for
  MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT (Daiane)
- Improve commit log and patch header for clearness (Daiane)

Lauren Post (1):
  kernel-module-imx-gpu-viv: Kernel loadable modules for 5.0.11.p6.3

Otavio Salvador (5):
  kernel-module-mcc: move to kernel-modules subdir
  fsl-vivante-kernel-driver-handler.bbclass: Handle Vivante kernel
    driver provider
  Enable Vivante kernel driver dynamic provider
  linux-fslc-mx6: Bump revision to 2574f81
  kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels

 classes/fsl-vivante-kernel-driver-handler.bbclass  | 65 ++++++++++++++++++++++
 conf/machine/include/imx-base.inc                  | 12 ++++
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc       |  8 ++-
 ...x-kernel-version-check-for-3.14-based-ker.patch | 35 ++++++++++++
 .../kernel-module-imx-gpu-viv_5.0.11.p6.3.bb       | 17 ++++++
 ...h-Only-include-mvf_sema4.h-if-building-in.patch |  0
 .../kernel-module-mcc_1.06.bb                      |  0
 recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb  |  2 +-
 recipes-kernel/linux/linux-imx.inc                 |  2 +-
 9 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 classes/fsl-vivante-kernel-driver-handler.bbclass
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
 rename recipes-kernel/{kernel-module-mcc => kernel-modules}/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch (100%)
 rename recipes-kernel/{kernel-module-mcc => kernel-modules}/kernel-module-mcc_1.06.bb (100%)

-- 
2.5.0



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [meta-fsl-arm PATCH v5 1/6] kernel-module-mcc: move to kernel-modules subdir
  2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
@ 2015-08-22 21:51 ` Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 2/6] kernel-module-imx-gpu-viv: Kernel loadable modules for 5.0.11.p6.3 Otavio Salvador
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

There are more kernel modules which are going to be packaged so it
makes sense to have them all in same subdirectory.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 .../mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch            | 0
 .../{kernel-module-mcc => kernel-modules}/kernel-module-mcc_1.06.bb       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename recipes-kernel/{kernel-module-mcc => kernel-modules}/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch (100%)
 rename recipes-kernel/{kernel-module-mcc => kernel-modules}/kernel-module-mcc_1.06.bb (100%)

diff --git a/recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch b/recipes-kernel/kernel-modules/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch
similarity index 100%
rename from recipes-kernel/kernel-module-mcc/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch
rename to recipes-kernel/kernel-modules/kernel-module-mcc/mcc_config.h-Only-include-mvf_sema4.h-if-building-in.patch
diff --git a/recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.06.bb b/recipes-kernel/kernel-modules/kernel-module-mcc_1.06.bb
similarity index 100%
rename from recipes-kernel/kernel-module-mcc/kernel-module-mcc_1.06.bb
rename to recipes-kernel/kernel-modules/kernel-module-mcc_1.06.bb
-- 
2.5.0



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [meta-fsl-arm PATCH v5 2/6] kernel-module-imx-gpu-viv: Kernel loadable modules for 5.0.11.p6.3
  2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 1/6] kernel-module-mcc: move to kernel-modules subdir Otavio Salvador
@ 2015-08-22 21:51 ` Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 3/6] fsl-vivante-kernel-driver-handler.bbclass: Handle Vivante kernel driver provider Otavio Salvador
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

From: Lauren Post <lauren.post@freescale.com>

This is the Vivante kernel driver split from the kernel source code in
order to make it possible to be used in any kernel source since
3.10.53.

The graphic version is 5.0.11.p6.3

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Improve commit log (Daiane)

 .../kernel-module-imx-gpu-viv_5.0.11.p6.3.bb             | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
new file mode 100644
index 0000000..db9dcbb
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
@@ -0,0 +1,16 @@
+# Copyright (C) 2015 Freescale Semiconductor
+
+SUMMARY = "Kernel loadable module for Vivante GPU"
+DESCRIPTION = "Provides flexibility to switch graphics between different kernels in future \
+releases. This package uses same source code as GPU kernel driver source."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+inherit module
+
+SRC_URI = "${FSL_MIRROR}/imx-gpu-viv-kernel-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}.tar.gz"
+
+SRC_URI[md5sum] = "6d46da80de94e98ee68ab1a75f384b89"
+SRC_URI[sha256sum] = "e4b02fc0c9bdbfc7ecc67a0bad0917e788921c8f2444d99bd77daae7f3cd95df"
+
+S = "${WORKDIR}/imx-gpu-viv-kernel-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-fsl-arm PATCH v5 3/6] fsl-vivante-kernel-driver-handler.bbclass: Handle Vivante kernel driver provider
  2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 1/6] kernel-module-mcc: move to kernel-modules subdir Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 2/6] kernel-module-imx-gpu-viv: Kernel loadable modules for 5.0.11.p6.3 Otavio Salvador
@ 2015-08-22 21:51 ` Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 4/6] Enable Vivante kernel driver dynamic provider Otavio Salvador
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

Enable the kernel to provide or not the Vivante kernel driver and
dynamically set the proper providers per machine.

The following options are supported:

  MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT

     Machine does or does not have support for the Vivante kernel
     driver, options are:

       0 - machine does not have Vivante GPU driver support
       1 - machine has Vivante GPU driver support

  MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE

      Machine uses the Vivante kernel driver as module, options are:

       0 - enable the builtin kernel driver module
       1 - enable the external kernel module

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v5: None
Changes in v4:
- Uses intermediate variable to fix override in machine definition files

Changes in v3:
- improve class documentation and commit log according to Ann suggestions

Changes in v2:
- improve commit log and class documentation for
  MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT (Daiane)

 classes/fsl-vivante-kernel-driver-handler.bbclass | 65 +++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 classes/fsl-vivante-kernel-driver-handler.bbclass

diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
new file mode 100644
index 0000000..740638a
--- /dev/null
+++ b/classes/fsl-vivante-kernel-driver-handler.bbclass
@@ -0,0 +1,65 @@
+# Freescale Kernel Vivante Kernel Driver handler
+#
+# Enable the kernel to provide or not the Vivante kernel driver and
+#  dynamically set the proper providers per machine.
+#
+# The following options are supported:
+#
+#  MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT
+#
+#     Machine does or does not have support for the Vivante kernel
+#     driver, options are:
+#
+#       0 - machine does not have Vivante GPU driver support
+#       1 - machine has Vivante GPU driver support
+#
+#  MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE
+#
+#      Machine uses the Vivante kernel driver as module, options are:
+#
+#       0 - enable the builtin kernel driver module
+#       1 - enable the external kernel module
+#
+# Copyright 2015 (C) O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+# Handle Vivante kernel driver setting:
+#   0 - machine does not have Vivante GPU driver support
+#   1 - machine has Vivante GPU driver support
+MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ??= "0"
+
+# Use Vivante kernel driver module:
+#   0 - enable the builtin kernel driver module
+#   1 - enable the external kernel module
+MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE ??= "1"
+
+python fsl_vivante_kernel_driver_handler () {
+    has_vivante_kernel_driver_support = e.data.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT', True) or "0"
+    use_vivante_kernel_driver_module = e.data.getVar('MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE', True) or "0"
+
+    if has_vivante_kernel_driver_support != "1":
+        return
+
+    if use_vivante_kernel_driver_module != "1":
+        e.data.appendVar('RPROVIDES_kernel-base', ' kernel-module-imx-gpu-viv')
+        e.data.appendVar('RREPLACES_kernel-base', ' kernel-module-imx-gpu-viv')
+        e.data.appendVar('RCONFLICTS_kernel-base', ' kernel-module-imx-gpu-viv')
+}
+
+addhandler fsl_vivante_kernel_driver_handler
+fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise"
+
+do_configure_prepend () {
+    if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then
+        fsl_viv_handler_defconfig="${WORKDIR}/defconfig"
+        if [ -e ${B}/.config ]; then
+            fsl_viv_handler_defconfig="${B}/.config"
+        fi
+        sed -i "/CONFIG_MXC_GPU_VIV[ =]/d" $fsl_viv_handler_defconfig
+        if [ "${MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE}" = "1" ]; then
+            echo "# CONFIG_MXC_GPU_VIV is not set" >> $fsl_viv_handler_defconfig
+        else
+            echo "CONFIG_MXC_GPU_VIV=y" >> $fsl_viv_handler_defconfig
+        fi
+    fi
+}
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-fsl-arm PATCH v5 4/6] Enable Vivante kernel driver dynamic provider
  2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
                   ` (2 preceding siblings ...)
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 3/6] fsl-vivante-kernel-driver-handler.bbclass: Handle Vivante kernel driver provider Otavio Salvador
@ 2015-08-22 21:51 ` Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 5/6] linux-fslc-mx6: Bump revision to 2574f81 Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 6/6] kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels Otavio Salvador
  5 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

The linux-imx.inc based kernels now can dynamically provide the
Vivante kernel driver and satisfy the runtime dependency added for the
Vivante GPU user space libraries. The beauty of this solution is that
it makes ease for 3rd party kernel to reuse the same infrastructure
and use the external module easily.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v5:
- Skip package when machine does not have Vivante kernel support
- Add SoC default for kernel support in imx-base.inc

Changes in v4:
- Silence the warning about missing build-dependency

Changes in v3: None
Changes in v2: None

 conf/machine/include/imx-base.inc            | 12 ++++++++++++
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc |  8 +++++++-
 recipes-kernel/linux/linux-imx.inc           |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 48d2e48..d5517dd 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -88,6 +88,18 @@ MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
 MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta"
 MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta"
 
+# Determines if the SoC has support for Vivante kernel driver
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT       = "0"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q  = "1"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sx = "1"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6sl = "1"
+
+# Handle Vivante kernel driver setting:
+#   0 - machine does not have Vivante GPU driver support
+#   1 - machine has Vivante GPU driver support
+MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ??= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}"
+
 # mx6 GPU libraries
 PREFERRED_PROVIDER_virtual/egl_mx6q ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/egl_mx6dl ?= "imx-gpu-viv"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 5de8a3d..b095cf2 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -50,8 +50,12 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
 	imx-gpu-viv-demos imx-gpu-viv-demos-dbg \
 "
 
-# Skip package if it does not match the machine float-point type in use
 python __anonymous () {
+        has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT', True) or '0')
+        if has_vivante_kernel_driver_support != '1':
+                raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.')
+
+        # Skip package if it does not match the machine float-point type in use
         is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d)
         is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp"
 
@@ -260,6 +264,8 @@ FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
 FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
 FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
 FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
+RDEPENDS_libgal-mx6 += "kernel-module-imx-gpu-viv"
+INSANE_SKIP_libgal-mx6 += "build-deps"
 
 FILES_libvsc-mx6 = "${libdir}/libVSC${SOLIBS}"
 
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index d790227..4835e78 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -4,7 +4,7 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-inherit kernel fsl-kernel-localversion
+inherit kernel fsl-kernel-localversion fsl-vivante-kernel-driver-handler
 
 # Put a local version until we have a true SRCREV to point to
 LOCALVERSION ?= ""
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-fsl-arm PATCH v5 5/6] linux-fslc-mx6: Bump revision to 2574f81
  2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
                   ` (3 preceding siblings ...)
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 4/6] Enable Vivante kernel driver dynamic provider Otavio Salvador
@ 2015-08-22 21:51 ` Otavio Salvador
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 6/6] kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels Otavio Salvador
  5 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

This upgrades the kernel fork for the 3.14.51 stable release. Another
change is the inclusion of:

22f6925 arm: Export cache flush management symbols when !MULTI_CACHE

This fixes following error:

galcore: Unknown symbol v7_dma_map_area (err 0)
galcore: Unknown symbol v7_dma_flush_range (err 0)

When using the Vivante GPU module as a module.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v5: None
Changes in v4: None
Changes in v3:
- New patch

Changes in v2: None

 recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb b/recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb
index 7b861bc..1a4936f 100644
--- a/recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb
+++ b/recipes-kernel/linux/linux-fslc-mx6_3.14-1.0.x.bb
@@ -11,6 +11,6 @@ include linux-fslc.inc
 PV .= "+git${SRCPV}"
 
 SRCBRANCH = "3.14-1.0.x-mx6"
-SRCREV = "966457723b6d74a65e21c05355b35ff22faa4ad4"
+SRCREV = "2574f81f0770e3d684cdd369f46fb6126db38441"
 
 COMPATIBLE_MACHINE = "(mx6)"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-fsl-arm PATCH v5 6/6] kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels
  2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
                   ` (4 preceding siblings ...)
  2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 5/6] linux-fslc-mx6: Bump revision to 2574f81 Otavio Salvador
@ 2015-08-22 21:51 ` Otavio Salvador
  5 siblings, 0 replies; 7+ messages in thread
From: Otavio Salvador @ 2015-08-22 21:51 UTC (permalink / raw)
  To: meta-freescale Mailing List; +Cc: Otavio Salvador

The build fail about the bus frequency header (linux/busfreq-imx6.h)
not being found is caused by the mistaken check for the wrong kernel
version.

This patch fixes it by adding the right kernel version to be checked.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Improve commit log and patch header for clearness (Daiane)

 ...x-kernel-version-check-for-3.14-based-ker.patch | 35 ++++++++++++++++++++++
 .../kernel-module-imx-gpu-viv_5.0.11.p6.3.bb       |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch
new file mode 100644
index 0000000..3b92ac8
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv/platform-Fix-kernel-version-check-for-3.14-based-ker.patch
@@ -0,0 +1,35 @@
+From 617bdbec386a1237e2a148989318cc4a1360788a Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Tue, 18 Aug 2015 23:08:48 +0000
+Subject: [PATCH] platform: Fix kernel version check for 3.14-based kernels
+Organization: O.S. Systems Software LTDA.
+
+The build fail about the bus frequency header (linux/busfreq-imx6.h)
+not being found is caused by the mistaken check for the wrong kernel
+version.
+
+This patch fixes it by adding the right kernel version to be checked.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ .../os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+index a2e72ff..241614a 100644
+--- a/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
++++ b/imx-gpu-viv-kernel-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+@@ -40,7 +40,7 @@
+ #include <linux/pm_runtime.h>
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ #include <mach/busfreq.h>
+-#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)
+ #include <linux/busfreq-imx6.h>
+ #include <linux/reset.h>
+ #else
+-- 
+2.1.4
+
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
index db9dcbb..a27decd 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p6.3.bb
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 inherit module
 
-SRC_URI = "${FSL_MIRROR}/imx-gpu-viv-kernel-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}.tar.gz"
+SRC_URI = "${FSL_MIRROR}/imx-gpu-viv-kernel-${@'${PV}'.replace('5.0.11.p6.3', '5.0.11.p6.3-beta')}.tar.gz \
+           file://platform-Fix-kernel-version-check-for-3.14-based-ker.patch"
 
 SRC_URI[md5sum] = "6d46da80de94e98ee68ab1a75f384b89"
 SRC_URI[sha256sum] = "e4b02fc0c9bdbfc7ecc67a0bad0917e788921c8f2444d99bd77daae7f3cd95df"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-08-22 21:52 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-22 21:51 [meta-fsl-arm PATCH v5 0/6] Dynamically choose between built-in or external Vivante GPU kernel driver Otavio Salvador
2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 1/6] kernel-module-mcc: move to kernel-modules subdir Otavio Salvador
2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 2/6] kernel-module-imx-gpu-viv: Kernel loadable modules for 5.0.11.p6.3 Otavio Salvador
2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 3/6] fsl-vivante-kernel-driver-handler.bbclass: Handle Vivante kernel driver provider Otavio Salvador
2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 4/6] Enable Vivante kernel driver dynamic provider Otavio Salvador
2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 5/6] linux-fslc-mx6: Bump revision to 2574f81 Otavio Salvador
2015-08-22 21:51 ` [meta-fsl-arm PATCH v5 6/6] kernel-module-imx-gpu-viv: Fix build against 3.14-based kernels Otavio Salvador

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.