From cc241bb61eaf1d9fb03717be3d01dc754d53ebea Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 18 Sep 2025 08:28:41 -0500 Subject: [PATCH] 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 Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/omap-a15.inc | 1 - meta-ti-bsp/conf/machine/include/ti33x.inc | 1 - meta-ti-bsp/conf/machine/include/ti43x.inc | 1 - meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb | 7 +------ 4 files changed, 1 insertion(+), 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 # Graphics providers and variables require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" -PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" KERNEL_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 # Graphics providers and variables require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" -PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" 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 # Graphics providers and variables require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" -PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" 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 = " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ " -SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38" +SRCREV = "68af6a102c2298569e77d1aa8bccc1ff61438b3e" PV = "24.0.1" -PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" -PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," -PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," - - PACKAGE_ARCH = "${MACHINE_ARCH}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}"