summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2020-10-21 11:25:20 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2024-01-08 14:01:48 +0100
commit47f7453eb8f300a1c17bd87688be49f91c0da0c6 (patch)
tree617d96723f531ccf1fa2dee4facf64d5f86eb599
parent29b606c774e273671f98602e24494dc1e28e02de (diff)
drm/armada: Sort primary plane formats in preference
I want to compute the preferred_depth from the primary plane formats (like atomic userspace would do), for that we need XRGB888 before ARGB888 or we'll get a preferred_depth of 32 instead of 24. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Russell King <linux@armlinux.org.uk>
-rw-r--r--drivers/gpu/drm/armada/armada_plane.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/armada/armada_plane.c b/drivers/gpu/drm/armada/armada_plane.c
index cc47c032dbc1..0032de27e5b3 100644
--- a/drivers/gpu/drm/armada/armada_plane.c
+++ b/drivers/gpu/drm/armada/armada_plane.c
@@ -18,20 +18,20 @@
#include "armada_trace.h"
static const uint32_t armada_primary_formats[] = {
- DRM_FORMAT_UYVY,
- DRM_FORMAT_YUYV,
- DRM_FORMAT_VYUY,
- DRM_FORMAT_YVYU,
- DRM_FORMAT_ARGB8888,
- DRM_FORMAT_ABGR8888,
DRM_FORMAT_XRGB8888,
DRM_FORMAT_XBGR8888,
+ DRM_FORMAT_ARGB8888,
+ DRM_FORMAT_ABGR8888,
DRM_FORMAT_RGB888,
DRM_FORMAT_BGR888,
DRM_FORMAT_ARGB1555,
DRM_FORMAT_ABGR1555,
DRM_FORMAT_RGB565,
DRM_FORMAT_BGR565,
+ DRM_FORMAT_UYVY,
+ DRM_FORMAT_YUYV,
+ DRM_FORMAT_VYUY,
+ DRM_FORMAT_YVYU,
};
void armada_drm_plane_calc(struct drm_plane_state *state, u32 addrs[2][3],