Merge pull request torvalds#88 from 96boards/working-colors-in-debian…

…-incorrect gpu/drm: hisilicon: set different color pattern for Android and X
hzhuang1 · Jun 30, 2015 · 5c27e19 · 5c27e19
2 parents cdf95d5 + 091a78e
commit 5c27e19
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/drivers/gpu/drm/hisilicon/hisi_drm_ade.c b/drivers/gpu/drm/hisilicon/hisi_drm_ade.c
@@ -388,8 +388,14 @@ static int hisi_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
 		writel((ADE_RGB_565 << 16) & 0x1f0000,
 		    ade_base + RD_CH_DISP_CTRL_REG);
 	else if (32 == fb->bits_per_pixel)
+#if defined(CONFIG_ANDROID)
 		writel((ADE_ARGB_8888 << 16) & 0x1f0000,
 		    ade_base + RD_CH_DISP_CTRL_REG);
+#else
+		writel((ADE_ABGR_8888 << 16) & 0x1f0000,
+		    ade_base + RD_CH_DISP_CTRL_REG);
+#endif /* CONFIG_ANDROID */
+
 	writel(display_addr, ade_base + RD_CH_DISP_ADDR_REG);
 	writel((fb_hight << 16) | stride, ade_base + RD_CH_DISP_SIZE_REG);
 	writel(stride, ade_base + RD_CH_DISP_STRIDE_REG);