Commit 26a7af3e authored by Tobias Jakobi's avatar Tobias Jakobi Committed by Inki Dae

drm/exynos: mixer: also allow ARGB1555 and ARGB4444

Allow the remaining alpha formats now that blending
is properly setup.
Signed-off-by: default avatarTobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent f657a996
...@@ -76,7 +76,9 @@ enum mixer_flag_bits { ...@@ -76,7 +76,9 @@ enum mixer_flag_bits {
static const uint32_t mixer_formats[] = { static const uint32_t mixer_formats[] = {
DRM_FORMAT_XRGB4444, DRM_FORMAT_XRGB4444,
DRM_FORMAT_ARGB4444,
DRM_FORMAT_XRGB1555, DRM_FORMAT_XRGB1555,
DRM_FORMAT_ARGB1555,
DRM_FORMAT_RGB565, DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB8888,
...@@ -169,6 +171,8 @@ static inline bool is_alpha_format(unsigned int pixel_format) ...@@ -169,6 +171,8 @@ static inline bool is_alpha_format(unsigned int pixel_format)
{ {
switch (pixel_format) { switch (pixel_format) {
case DRM_FORMAT_ARGB8888: case DRM_FORMAT_ARGB8888:
case DRM_FORMAT_ARGB1555:
case DRM_FORMAT_ARGB4444:
return true; return true;
default: default:
return false; return false;
...@@ -595,10 +599,12 @@ static void mixer_graph_buffer(struct mixer_context *ctx, ...@@ -595,10 +599,12 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
switch (fb->pixel_format) { switch (fb->pixel_format) {
case DRM_FORMAT_XRGB4444: case DRM_FORMAT_XRGB4444:
case DRM_FORMAT_ARGB4444:
fmt = MXR_FORMAT_ARGB4444; fmt = MXR_FORMAT_ARGB4444;
break; break;
case DRM_FORMAT_XRGB1555: case DRM_FORMAT_XRGB1555:
case DRM_FORMAT_ARGB1555:
fmt = MXR_FORMAT_ARGB1555; fmt = MXR_FORMAT_ARGB1555;
break; break;
......
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