Commit 7a57ca7c authored by Tobias Jakobi's avatar Tobias Jakobi Committed by Inki Dae

drm/exynos: mixer: cleanup pixelformat handling

Move the defines for the pixelformats that the mixer supports out
of mixer_graph_buffer() to the top of the source.
Then select the mixer pixelformat (pf) in mixer_graph_buffer() based on
the plane's pf (and not bpp).
Also add handling of RGB565 and XRGB1555 to the switch statement and
exit early if the plane has an unsupported pf.

Partially based on 'drm/exynos: enable/disable blend based on pixel
format' by Gustavo Padovan <gustavo.padovan@collabora.co.uk>.

v2: Use the shorter MXR_FORMAT as prefix.
v3: Re-add ARGB8888 because of compatibility reasons
    (suggested by Joonyoung Shim).
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarTobias Jakobi <tjakobi@math.uni-bielefeld.de>
Acked-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 8f2590f8
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
#define MIXER_WIN_NR 3 #define MIXER_WIN_NR 3
#define MIXER_DEFAULT_WIN 0 #define MIXER_DEFAULT_WIN 0
/* The pixelformats that are natively supported by the mixer. */
#define MXR_FORMAT_RGB565 4
#define MXR_FORMAT_ARGB1555 5
#define MXR_FORMAT_ARGB4444 6
#define MXR_FORMAT_ARGB8888 7
struct mixer_resources { struct mixer_resources {
int irq; int irq;
void __iomem *mixer_regs; void __iomem *mixer_regs;
...@@ -521,20 +527,27 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win) ...@@ -521,20 +527,27 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win)
plane = &ctx->planes[win]; plane = &ctx->planes[win];
#define RGB565 4 switch (plane->pixel_format) {
#define ARGB1555 5 case DRM_FORMAT_XRGB4444:
#define ARGB4444 6 fmt = MXR_FORMAT_ARGB4444;
#define ARGB8888 7 break;
case DRM_FORMAT_XRGB1555:
fmt = MXR_FORMAT_ARGB1555;
break;
switch (plane->bpp) { case DRM_FORMAT_RGB565:
case 16: fmt = MXR_FORMAT_RGB565;
fmt = ARGB4444;
break; break;
case 32:
fmt = ARGB8888; case DRM_FORMAT_XRGB8888:
case DRM_FORMAT_ARGB8888:
fmt = MXR_FORMAT_ARGB8888;
break; break;
default: default:
fmt = ARGB8888; DRM_DEBUG_KMS("pixelformat unsupported by mixer\n");
return;
} }
/* check if mixer supports requested scaling setup */ /* check if mixer supports requested scaling setup */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment