projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02e399d)
MLK-19158-3 gpu: imx: lcdif: fix output order for 16bpp BGR formats
authorFancy Fang <chen.fang@nxp.com>
Sun, 12 Aug 2018 04:02:43 +0000 (12:02 +0800)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
The 16bpp BGR order pixel formats 'DRM_FORMAT_ABGR1555' and
'DRM_FORMAT_XBGR1555' also require to be re-ordered to RGB
order for display, just like the format 'DRM_FORMAT_BGR565'
does.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit f5cc4f4699570fe697d21cb47c54aa91b82c8458)
(cherry picked from commit f16eac4a32b333b8ccdadaebf540f2d2a522d240)

drivers/gpu/imx/lcdif/lcdif-common.c patch | blob | history

diff --git a/drivers/gpu/imx/lcdif/lcdif-common.c b/drivers/gpu/imx/lcdif/lcdif-common.c
index f7b887c..86b1069 100644 (file)
--- a/drivers/gpu/imx/lcdif/lcdif-common.c
+++ b/drivers/gpu/imx/lcdif/lcdif-common.c
@@ -317,7 +317,9 @@ int lcdif_set_pix_fmt(struct lcdif_soc *lcdif, u32 format)
                ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0xf);
 
                /* 'BGR' order */
-               if (format == DRM_FORMAT_BGR565)
+               if (format == DRM_FORMAT_BGR565         ||
+                   format == DRM_FORMAT_ABGR1555       ||
+                   format == DRM_FORMAT_XBGR1555)
                        writel(CTRL2_ODD_LINE_PATTERN(0x5) |
                               CTRL2_EVEN_LINE_PATTERN(0x5),
                               lcdif->base + LCDIF_CTRL2 + REG_SET);