drm/exynos: mixer: also allow ARGB1555 and ARGB4444

Allow the remaining alpha formats now that blending
is properly setup.

Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index ae7b122274acad6f4358f84c8ee21c69f3181cc3..31a9a228744e7d09140a5f77d713ebdd18749809 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -76,7 +76,9 @@ enum mixer_flag_bits {
 
 static const uint32_t mixer_formats[] = {
        DRM_FORMAT_XRGB4444,
+       DRM_FORMAT_ARGB4444,
        DRM_FORMAT_XRGB1555,
+       DRM_FORMAT_ARGB1555,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB8888,
        DRM_FORMAT_ARGB8888,
@@ -169,6 +171,8 @@ static inline bool is_alpha_format(unsigned int pixel_format)
 {
        switch (pixel_format) {
        case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_ARGB1555:
+       case DRM_FORMAT_ARGB4444:
                return true;
        default:
                return false;
@@ -595,10 +599,12 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
 
        switch (fb->pixel_format) {
        case DRM_FORMAT_XRGB4444:
+       case DRM_FORMAT_ARGB4444:
                fmt = MXR_FORMAT_ARGB4444;
                break;
 
        case DRM_FORMAT_XRGB1555:
+       case DRM_FORMAT_ARGB1555:
                fmt = MXR_FORMAT_ARGB1555;
                break;