As kmsro allows an essentially mix-and-match hodgepodge of display drivers and renderonly GPUs, it doesn't make sense to couple the display driver entrypoint definition with the driver. Instead, we move *all* kmsro entrypoints to a shared kmsro block at the end (avoiding clutter and distraction since this list may snowball in the future).
v2: Alphabetize driver list. Signed-off-by: Alyssa Rosenzweig <aly...@rosenzweig.io> --- src/gallium/targets/dri/target.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c index 17484ced979..8acec0c819d 100644 --- a/src/gallium/targets/dri/target.c +++ b/src/gallium/targets/dri/target.c @@ -77,21 +77,11 @@ DEFINE_LOADER_DRM_ENTRYPOINT(v3d) #if defined(GALLIUM_VC4) DEFINE_LOADER_DRM_ENTRYPOINT(vc4) -#if defined(GALLIUM_KMSRO) -DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d) -DEFINE_LOADER_DRM_ENTRYPOINT(pl111) -#endif #endif #if defined(GALLIUM_PANFROST) DEFINE_LOADER_DRM_ENTRYPOINT(panfrost) -#if defined(GALLIUM_KMSRO) -DEFINE_LOADER_DRM_ENTRYPOINT(rockchip) -DEFINE_LOADER_DRM_ENTRYPOINT(meson) #endif -#endif - - #if defined(GALLIUM_ETNAVIV) DEFINE_LOADER_DRM_ENTRYPOINT(imx_drm) @@ -101,3 +91,11 @@ DEFINE_LOADER_DRM_ENTRYPOINT(etnaviv) #if defined(GALLIUM_TEGRA) DEFINE_LOADER_DRM_ENTRYPOINT(tegra); #endif + +#if defined(GALLIUM_KMSRO) +DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d) +DEFINE_LOADER_DRM_ENTRYPOINT(meson) +DEFINE_LOADER_DRM_ENTRYPOINT(pl111) +DEFINE_LOADER_DRM_ENTRYPOINT(rockchip) +#endif + -- 2.20.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
