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:
fda2f60
)
osd: fix osd display error for logo module not loaded
author
Pengcheng Chen
<pengcheng.chen@amlogic.com>
Thu, 13 Apr 2017 10:34:35 +0000
(18:34 +0800)
committer
Jianxin Pan
<jianxin.pan@amlogic.com>
Thu, 13 Apr 2017 12:41:52 +0000
(
05:41
-0700)
PD#138714: fix osd display error for logo module not loaded
Change-Id: Ie33d76d344b47175acdbb232fd8c7265a0800450
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
5e87d4a
..
75faf9b
100644
(file)
--- a/
drivers/amlogic/media/osd/osd_hw.c
+++ b/
drivers/amlogic/media/osd/osd_hw.c
@@
-3256,7
+3256,7
@@
void osd_init_hw(u32 logo_loaded)
osd_hw.free_src_data[OSD2].x_end = 0;
osd_hw.free_src_data[OSD2].y_start = 0;
osd_hw.free_src_data[OSD2].y_end = 0;
- osd_hw.free_scale_mode[OSD1] =
0
;
+ osd_hw.free_scale_mode[OSD1] =
1
;
osd_hw.free_scale_mode[OSD2] = 1;
if (get_cpu_type() == MESON_CPU_MAJOR_ID_GXM)
osd_reg_write(VPP_OSD_SC_DUMMY_DATA, 0x002020ff);