AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Add the gallium glue to get panfrost loaded when panthor is detected

Browse Source 
Needed if we don't want to force users to pass GALLIUM_DRIVER=panfrost.

Reviewed-by: Antonino Maniscalco <antonino.maniscalco@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26358>
This commit is contained in:
Bob Beckett
2023-11-14 11:18:23 +01:00
committed by Marge Bot
parent a29443dc6b
commit f54c8413e6
5 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+2
View File
@@ -82,6 +82,7 @@ static const struct drm_driver_descriptor *driver_descriptors[] = {
&v3d_driver_descriptor,
&vc4_driver_descriptor,
&panfrost_driver_descriptor,
&panthor_driver_descriptor,
&asahi_driver_descriptor,
&etnaviv_driver_descriptor,
&tegra_driver_descriptor,
@@ -289,6 +290,7 @@ pipe_loader_get_compatible_render_capable_device_fd(int kms_only_fd)
#endif
#if defined GALLIUM_PANFROST
"panfrost",
"panthor",
#endif
#if defined GALLIUM_V3D
"v3d",
src/gallium/auxiliary/target-helpers/drm_helper.h
+2
View File
@@ -335,9 +335,11 @@ pipe_panfrost_create_screen(int fd, const struct pipe_screen_config *config)
return screen ? debug_screen_wrap(screen) : NULL;
}
DRM_DRIVER_DESCRIPTOR(panfrost, NULL, 0)
DRM_DRIVER_DESCRIPTOR_ALIAS(panfrost, panthor, NULL, 0)
#else
DRM_DRIVER_DESCRIPTOR_STUB(panfrost)
DRM_DRIVER_DESCRIPTOR_STUB(panthor)
#endif
#ifdef GALLIUM_ASAHI
src/gallium/auxiliary/target-helpers/drm_helper_public.h
+1
View File
@@ -18,6 +18,7 @@ extern const struct drm_driver_descriptor virtio_gpu_driver_descriptor;
extern const struct drm_driver_descriptor v3d_driver_descriptor;
extern const struct drm_driver_descriptor vc4_driver_descriptor;
extern const struct drm_driver_descriptor panfrost_driver_descriptor;
extern const struct drm_driver_descriptor panthor_driver_descriptor;
extern const struct drm_driver_descriptor asahi_driver_descriptor;
extern const struct drm_driver_descriptor etnaviv_driver_descriptor;
extern const struct drm_driver_descriptor tegra_driver_descriptor;
src/gallium/targets/dri/meson.build
+1 -1
View File
@@ -112,7 +112,7 @@ foreach d : [[with_gallium_kmsro, [
[with_gallium_softpipe and with_gallium_drisw_kms, 'kms_swrast_dri.so'],
[with_gallium_v3d, 'v3d_dri.so'],
[with_gallium_vc4, 'vc4_dri.so'],
[with_gallium_panfrost, 'panfrost_dri.so'],
[with_gallium_panfrost, ['panfrost_dri.so', 'panthor_dri.so']],
[with_gallium_etnaviv, 'etnaviv_dri.so'],
[with_gallium_tegra, 'tegra_dri.so'],
[with_gallium_crocus, 'crocus_dri.so'],
src/gallium/targets/dri/target.c
+1
View File
@@ -84,6 +84,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(vc4)
#if defined(GALLIUM_PANFROST)
DEFINE_LOADER_DRM_ENTRYPOINT(panfrost)
DEFINE_LOADER_DRM_ENTRYPOINT(panthor)
#endif
#if defined(GALLIUM_ASAHI)