Module: Mesa Branch: main Commit: 1f552f1bf32b0b90d137c4a0f3ad9b977f7821ac URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f552f1bf32b0b90d137c4a0f3ad9b977f7821ac
Author: Eric Engestrom <[email protected]> Date: Mon Mar 27 18:43:10 2023 +0100 kmsro: sort drivers alphabetically Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22144> --- src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c index e2028d4eb31..a39a495eee4 100644 --- a/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c +++ b/src/gallium/winsys/kmsro/drm/kmsro_drm_winsys.c @@ -72,15 +72,11 @@ struct pipe_screen *kmsro_drm_screen_create(int fd, struct renderonly *, struct winsys_handle *); } renderonly_drivers[] = { -#if defined(GALLIUM_VC4) - /* Passes the vc4-allocated BO through to the KMS-only DRM device using - * PRIME buffer sharing. The VC4 BO must be linear, which the SCANOUT - * flag on allocation will have ensured. - */ +#if defined(GALLIUM_ASAHI) { - .name = "vc4", - .create_screen = vc4_drm_screen_create_renderonly, - .create_for_resource = renderonly_create_gpu_import_for_resource, + .name = "asahi", + .create_screen = asahi_drm_screen_create_renderonly, + .create_for_resource = renderonly_create_kms_dumb_buffer_for_resource, }, #endif @@ -100,18 +96,18 @@ struct pipe_screen *kmsro_drm_screen_create(int fd, }, #endif -#if defined(GALLIUM_PANFROST) +#if defined(GALLIUM_LIMA) { - .name = "panfrost", - .create_screen = panfrost_drm_screen_create_renderonly, + .name = "lima", + .create_screen = lima_drm_screen_create_renderonly, .create_for_resource = renderonly_create_kms_dumb_buffer_for_resource, }, #endif -#if defined(GALLIUM_LIMA) +#if defined(GALLIUM_PANFROST) { - .name = "lima", - .create_screen = lima_drm_screen_create_renderonly, + .name = "panfrost", + .create_screen = panfrost_drm_screen_create_renderonly, .create_for_resource = renderonly_create_kms_dumb_buffer_for_resource, }, #endif @@ -124,11 +120,15 @@ struct pipe_screen *kmsro_drm_screen_create(int fd, }, #endif -#if defined(GALLIUM_ASAHI) +#if defined(GALLIUM_VC4) + /* Passes the vc4-allocated BO through to the KMS-only DRM device using + * PRIME buffer sharing. The VC4 BO must be linear, which the SCANOUT + * flag on allocation will have ensured. + */ { - .name = "asahi", - .create_screen = asahi_drm_screen_create_renderonly, - .create_for_resource = renderonly_create_kms_dumb_buffer_for_resource, + .name = "vc4", + .create_screen = vc4_drm_screen_create_renderonly, + .create_for_resource = renderonly_create_gpu_import_for_resource, }, #endif };
