pipe-loader,gallium/drm: Fix the kmsro pipe_loader target

Include drm_helper.h to define the driver descriptor again, but with a
new define GALLIUM_KMSRO_ONLY to disable defining descriptors for the
drivers that kmsro uses.

Fixes clinfo on Panfrost.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4002
Fixes: 9ec28b8d22 ("gallium/drm: Deduplicate screen creation for the dynamic (clover) pipe loader.")
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9380>
(cherry picked from commit 06a883cfe5)
This commit is contained in:
Icecream95 2021-03-01 10:51:45 +13:00 committed by Dylan Baker
parent da38b604e3
commit 5bcbe14854
3 changed files with 12 additions and 1 deletions

View file

@ -382,7 +382,7 @@
"description": "pipe-loader,gallium/drm: Fix the kmsro pipe_loader target",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "9ec28b8d226558aa2748dbf813b125f8938a09cc"
},

View file

@ -60,6 +60,15 @@ const struct drm_driver_descriptor descriptor_name = { \
#endif
#ifdef GALLIUM_KMSRO_ONLY
#undef GALLIUM_V3D
#undef GALLIUM_VC4
#undef GALLIUM_FREEDRENO
#undef GALLIUM_ETNAVIV
#undef GALLIUM_PANFROST
#undef GALLIUM_LIMA
#endif
#ifdef GALLIUM_I915
#include "i915/drm/i915_drm_public.h"
#include "i915/i915_public.h"

View file

@ -2,3 +2,5 @@
#include "target-helpers/inline_debug_helper.h"
#include "frontend/drm_driver.h"
#include "kmsro/drm/kmsro_drm_public.h"
#define GALLIUM_KMSRO_ONLY
#include "target-helpers/drm_helper.h"