diff options
| author | Tobias Jakobi | 2015-12-16 13:21:47 +0100 |
|---|---|---|
| committer | Inki Dae | 2016-01-12 16:16:36 +0100 |
| commit | 26a7af3ed8a59c27ce125e7619272ca45630d000 (patch) | |
| tree | ec23f7e128e32ec10b2917f2a4ee2bd24112c165 /drivers/gpu | |
| parent | drm/exynos: mixer: refactor layer setup (diff) | |
| download | kernel-qcow2-linux-26a7af3ed8a59c27ce125e7619272ca45630d000.tar.gz kernel-qcow2-linux-26a7af3ed8a59c27ce125e7619272ca45630d000.tar.xz kernel-qcow2-linux-26a7af3ed8a59c27ce125e7619272ca45630d000.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index ae7b122274ac..31a9a228744e 100644 --- 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; |