mesa: RPi: rebase patches for 24.2.0-rc1

This commit is contained in:
Rudi Heitbaum 2024-07-20 07:50:59 +00:00
parent f8e126383d
commit 4ffd76ef6e

View File

@ -6,15 +6,15 @@ Subject: [PATCH 1/3] gallium: Add kmsro drivers for RP1 DSI, DPI, and VEC
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
--- ---
src/gallium/targets/dri/meson.build | 3 +++ src/gallium/targets/dril/meson.build | 3 +++
src/gallium/targets/dri/target.c | 3 +++ src/gallium/targets/dri/dri_target.c | 3 +++
2 files changed, 6 insertions(+) 2 files changed, 6 insertions(+)
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build
index 66619bba0db..443923772e8 100644 index 66619bba0db..443923772e8 100644
--- a/src/gallium/targets/dri/meson.build --- a/src/gallium/targets/dril/meson.build
+++ b/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dril/meson.build
@@ -68,6 +68,9 @@ libgallium_dri = shared_library( @@ -64,6 +64,9 @@
foreach d : [[with_gallium_kmsro, [ foreach d : [[with_gallium_kmsro, [
'armada-drm_dri.so', 'armada-drm_dri.so',
@ -22,13 +22,13 @@ index 66619bba0db..443923772e8 100644
+ 'drm-rp1-dsi_dri.so', + 'drm-rp1-dsi_dri.so',
+ 'drm-rp1-vec_dri.so', + 'drm-rp1-vec_dri.so',
'exynos_dri.so', 'exynos_dri.so',
'gm12u320_dri.so',
'hdlcd_dri.so', 'hdlcd_dri.so',
'hx8357d_dri.so', diff --git a/src/gallium/targets/dri/dri_target.c b/src/gallium/targets/dri/dri_target.c
diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
index 9d3069eb004..79f60a7224a 100644 index 9d3069eb004..79f60a7224a 100644
--- a/src/gallium/targets/dri/target.c --- a/src/gallium/targets/dri/dri_target.c
+++ b/src/gallium/targets/dri/target.c +++ b/src/gallium/targets/dri/dri_target.c
@@ -98,6 +98,9 @@ DEFINE_LOADER_DRM_ENTRYPOINT(tegra); @@ -101,6 +101,9 @@
#if defined(GALLIUM_KMSRO) #if defined(GALLIUM_KMSRO)
DEFINE_LOADER_DRM_ENTRYPOINT(armada_drm) DEFINE_LOADER_DRM_ENTRYPOINT(armada_drm)
@ -36,8 +36,8 @@ index 9d3069eb004..79f60a7224a 100644
+DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_dsi) +DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_dsi)
+DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_vec) +DEFINE_LOADER_DRM_ENTRYPOINT(drm_rp1_vec)
DEFINE_LOADER_DRM_ENTRYPOINT(exynos) DEFINE_LOADER_DRM_ENTRYPOINT(exynos)
DEFINE_LOADER_DRM_ENTRYPOINT(gm12u320)
DEFINE_LOADER_DRM_ENTRYPOINT(hdlcd) DEFINE_LOADER_DRM_ENTRYPOINT(hdlcd)
DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d)
-- --
2.39.2 2.39.2