aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Jakobi <tjakobi@math.uni-bielefeld.de>2015-12-16 07:21:47 -0500
committerInki Dae <daeinki@gmail.com>2016-01-12 10:16:36 -0500
commit26a7af3ed8a59c27ce125e7619272ca45630d000 (patch)
treeec23f7e128e32ec10b2917f2a4ee2bd24112c165
parentf657a9962070ae2502fcedf2c6568c393039d4c2 (diff)
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>
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c6
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 {
76 76
77static const uint32_t mixer_formats[] = { 77static const uint32_t mixer_formats[] = {
78 DRM_FORMAT_XRGB4444, 78 DRM_FORMAT_XRGB4444,
79 DRM_FORMAT_ARGB4444,
79 DRM_FORMAT_XRGB1555, 80 DRM_FORMAT_XRGB1555,
81 DRM_FORMAT_ARGB1555,
80 DRM_FORMAT_RGB565, 82 DRM_FORMAT_RGB565,
81 DRM_FORMAT_XRGB8888, 83 DRM_FORMAT_XRGB8888,
82 DRM_FORMAT_ARGB8888, 84 DRM_FORMAT_ARGB8888,
@@ -169,6 +171,8 @@ static inline bool is_alpha_format(unsigned int pixel_format)
169{ 171{
170 switch (pixel_format) { 172 switch (pixel_format) {
171 case DRM_FORMAT_ARGB8888: 173 case DRM_FORMAT_ARGB8888:
174 case DRM_FORMAT_ARGB1555:
175 case DRM_FORMAT_ARGB4444:
172 return true; 176 return true;
173 default: 177 default:
174 return false; 178 return false;
@@ -595,10 +599,12 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
595 599
596 switch (fb->pixel_format) { 600 switch (fb->pixel_format) {
597 case DRM_FORMAT_XRGB4444: 601 case DRM_FORMAT_XRGB4444:
602 case DRM_FORMAT_ARGB4444:
598 fmt = MXR_FORMAT_ARGB4444; 603 fmt = MXR_FORMAT_ARGB4444;
599 break; 604 break;
600 605
601 case DRM_FORMAT_XRGB1555: 606 case DRM_FORMAT_XRGB1555:
607 case DRM_FORMAT_ARGB1555:
602 fmt = MXR_FORMAT_ARGB1555; 608 fmt = MXR_FORMAT_ARGB1555;
603 break; 609 break;
604 610