From 9094207bb7b8e8bc37a22aff8dedb887a2c3e218 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 21 Oct 2020 14:04:08 +0200 Subject: drm/pl1111: Sort formats by preference. Per commit 9f8d4fe94eb4fb958fc92ee91a3ec54ab378339c Author: Linus Walleij Date: Fri Mar 2 10:09:45 2018 +0100 drm/pl111: Make the default BPP a per-variant variable these two really prefer the 16bpp formats everywhere. Signed-off-by: Daniel Vetter Cc: Eric Anholt --- drivers/gpu/drm/pl111/pl111_drv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 02e6b74d5016..0e8aceb610c7 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -339,14 +339,14 @@ static void pl111_amba_shutdown(struct amba_device *amba_dev) * This early variant lacks the 565 and 444 pixel formats. */ static const u32 pl110_pixel_formats[] = { - DRM_FORMAT_ABGR8888, - DRM_FORMAT_XBGR8888, - DRM_FORMAT_ARGB8888, - DRM_FORMAT_XRGB8888, DRM_FORMAT_ABGR1555, DRM_FORMAT_XBGR1555, DRM_FORMAT_ARGB1555, DRM_FORMAT_XRGB1555, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_ARGB8888, + DRM_FORMAT_XRGB8888, }; static const struct pl111_variant_data pl110_variant = { @@ -383,12 +383,6 @@ static const struct pl111_variant_data pl111_variant = { }; static const u32 pl110_nomadik_pixel_formats[] = { - DRM_FORMAT_RGB888, - DRM_FORMAT_BGR888, - DRM_FORMAT_ABGR8888, - DRM_FORMAT_XBGR8888, - DRM_FORMAT_ARGB8888, - DRM_FORMAT_XRGB8888, DRM_FORMAT_BGR565, DRM_FORMAT_RGB565, DRM_FORMAT_ABGR1555, @@ -399,6 +393,12 @@ static const u32 pl110_nomadik_pixel_formats[] = { DRM_FORMAT_XBGR4444, DRM_FORMAT_ARGB4444, DRM_FORMAT_XRGB4444, + DRM_FORMAT_RGB888, + DRM_FORMAT_BGR888, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_ARGB8888, + DRM_FORMAT_XRGB8888, }; static const struct pl111_variant_data pl110_nomadik_variant = { -- cgit v1.2.3