summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Davis <afd@ti.com>2025-09-18 08:28:41 -0500
committerRyan Eatmon <reatmon@ti.com>2025-09-18 23:56:22 -0500
commitcc241bb61eaf1d9fb03717be3d01dc754d53ebea (patch)
tree42e673da9ccbead6e991e1bcaa2b0783517963af
parenta96f917db84b3e803f80a67a6f6955da52d94e74 (diff)
downloadmeta-ti-cc241bb61eaf1d9fb03717be3d01dc754d53ebea.tar.gz
mesa-pvr: Remove need for PVR/SGX display aliases
Update mesa-pvr which includes a default set of display controller aliases for the supported display controllers. This means we do not have to manually set the alias for each device here in the integration layer. Remove that here. Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/include/omap-a15.inc1
-rw-r--r--meta-ti-bsp/conf/machine/include/ti33x.inc1
-rw-r--r--meta-ti-bsp/conf/machine/include/ti43x.inc1
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb7
4 files changed, 1 insertions, 9 deletions
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index aed2c727..8e029431 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc
9# Graphics providers and variables 9# Graphics providers and variables
10require conf/machine/include/mesa-pvr.inc 10require conf/machine/include/mesa-pvr.inc
11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" 11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
12PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
13 12
14KERNEL_IMAGETYPE = "zImage" 13KERNEL_IMAGETYPE = "zImage"
15KERNEL_IMAGETYPES = "zImage uImage" 14KERNEL_IMAGETYPES = "zImage uImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index 662fbd03..252b6e5a 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc
9# Graphics providers and variables 9# Graphics providers and variables
10require conf/machine/include/mesa-pvr.inc 10require conf/machine/include/mesa-pvr.inc
11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" 11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
12PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"
13 12
14KERNEL_IMAGETYPE = "zImage" 13KERNEL_IMAGETYPE = "zImage"
15 14
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 6150d106..5c09e2f5 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc
9# Graphics providers and variables 9# Graphics providers and variables
10require conf/machine/include/mesa-pvr.inc 10require conf/machine/include/mesa-pvr.inc
11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" 11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
12PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
13 12
14KERNEL_IMAGETYPE = "zImage" 13KERNEL_IMAGETYPE = "zImage"
15 14
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
index e4f99d36..01426680 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
@@ -26,14 +26,9 @@ PACKAGECONFIG:append = " \
26 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ 26 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
27" 27"
28 28
29SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38" 29SRCREV = "68af6a102c2298569e77d1aa8bccc1ff61438b3e"
30PV = "24.0.1" 30PV = "24.0.1"
31 31
32PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
33PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
34PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
35
36
37PACKAGE_ARCH = "${MACHINE_ARCH}" 32PACKAGE_ARCH = "${MACHINE_ARCH}"
38 33
39GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" 34GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}"