commit 5b3495bbe4c1dc34cb9ea0ea48f4c2e919dd8a12
author John Bauman <jbauman@google.com> Tue Feb 20 13:19:16 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Feb 21 00:12:05 2018 +0000
tree 3404a432f0eb93b7b743b9a7349afc2aca7590eb
parent c3ced70522b6d39809afdc06c40dfd55ecd2e245

[display][vim] Disable alpha channel.

Replace the contents with 0xff, because the framebuffer format
advertised is RGB_x888.

Change-Id: I66ce6a57835a34f312db8b0095caac7e8eb06dd3

system/dev/display/vim-display/osd2.c

diff --git a/system/dev/display/vim-display/osd2.c b/system/dev/display/vim-display/osd2.c
index e6f166d..46d922c 100644
--- a/system/dev/display/vim-display/osd2.c
+++ b/system/dev/display/vim-display/osd2.c
@@ -78,6 +78,9 @@
     VPU_VIU_OSD2_BLK_CFG_RGB_EN = (1 << 7),
     VPU_VIU_OSD2_BLK_CFG_COLOR_MATRIX_ARGB = 1,
     VPU_VIU_OSD2_BLK_CFG_COLOR_MATRIX_SHIFT = 2,
+
+    VPU_VIU_OSD2_CTRL_STAT2_REPLACED_ALPHA_EN = (1 << 14),
+    VPU_VIU_OSD2_CTRL_STAT2_REPLACED_ALPHA_SHIFT = 6u,
 };
 
 zx_status_t configure_osd2(vim2_display_t* display)
@@ -93,6 +96,9 @@
 
     DISP_INFO("0x%x 0x%x\n", READ32_VPU_REG(VPU_VPP_MISC), READ32_VPU_REG(VPU_VPP_OSD_SC_CTRL0));
 
+    uint32_t ctrl_stat2 = READ32_VPU_REG(VPU_VIU_OSD2_CTRL_STAT2);
+    WRITE32_VPU_REG(VPU_VIU_OSD2_CTRL_STAT2, ctrl_stat2 | VPU_VIU_OSD2_CTRL_STAT2_REPLACED_ALPHA_EN | (0xff << VPU_VIU_OSD2_CTRL_STAT2_REPLACED_ALPHA_SHIFT));
+
     uint32_t cfg_w0 = (OSD2_DMC_CAV_INDEX << VPU_VIU_OSD2_BLK_CFG_TBL_ADDR_SHIFT) |
                       VPU_VIU_OSD2_BLK_CFG_LITTLE_ENDIAN | VPU_VIU_OSD2_BLK_CFG_RGB_EN |
                       (VPU_VIU_OSD2_BLK_CFG_OSD_BLK_MODE_32_BIT << VPU_VIU_OSD2_BLK_CFG_OSD_BLK_MODE_SHIFT) |