projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d9f755a
)
osd: meson-hwc screen always blank [1/1]
author
pengcheng chen
<pengcheng.chen@amlogic.com>
Wed, 31 Oct 2018 11:32:59 +0000
(19:32 +0800)
committer
Tao Zeng
<tao.zeng@amlogic.com>
Mon, 12 Nov 2018 03:22:30 +0000
(20:22 -0700)
PD#163001
Problem:
TL1 code merged caused meson-hwc screen always blank
Solution:
fix meson-hwc screen always blank
Verify:
verified in u200 board
Change-Id: I0a9371b42546e2713e6dcb926e7c94598e29da1d
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
drivers/amlogic/media/osd/osd_hw.c
patch
|
blob
|
history
diff --git
a/drivers/amlogic/media/osd/osd_hw.c
b/drivers/amlogic/media/osd/osd_hw.c
index
93e5ebd
..
a6903eb
100644
(file)
--- a/
drivers/amlogic/media/osd/osd_hw.c
+++ b/
drivers/amlogic/media/osd/osd_hw.c
@@
-7215,7
+7215,11
@@
static void set_blend_reg(struct layer_blend_reg_s *blend_reg)
{
int i;
u32 reg_offset = 2;
+#ifdef OSD_BLEND_SHIFT_WORKAROUND
+ u32 osd_count = OSD_BLEND_LAYERS;
+#else
u32 osd_count = osd_hw.osd_meson_dev.viu1_osd_count;
+#endif
if (!blend_reg)
return;