shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: set hdr size according osd blend0 out size [1/1]

Browse Source 
PD#IPTV-2395

Problem:
osd last line have abnormal data

Solution:
set hdr size according osd blend0 out size

Verify:
Verfied on u212

Change-Id: Iad738b16fce066270c78213f1b696a802e1b8da6
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
This commit is contained in:
Pengcheng Chen
2019-05-07 18:44:17 +08:00
committed by Tao Zeng
parent 1642f53a92
commit 481d4f2ec4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -6173,8 +6173,6 @@ static int vpp_blend_setting_default(u32 index)
osd1_v_start = osd_hw.dispdata[index].y_start; osd1_v_start = osd_hw.dispdata[index].y_start;
osd1_v_end = osd_hw.dispdata[index].y_end; osd1_v_end = osd_hw.dispdata[index].y_end;
} }
VSYNCOSD_WR_MPEG_REG(VPP_OSD1_IN_SIZE,
osd1_dst_h | osd1_dst_v << 16);
/* setting blend scope */ /* setting blend scope */
VSYNCOSD_WR_MPEG_REG(VPP_OSD1_BLD_H_SCOPE, VSYNCOSD_WR_MPEG_REG(VPP_OSD1_BLD_H_SCOPE,
@@ -8062,6 +8060,10 @@ static void set_blend_reg(struct layer_blend_reg_s *blend_reg)
VSYNCOSD_WR_MPEG_REG(VIU_OSD_BLEND_BLEND0_SIZE, VSYNCOSD_WR_MPEG_REG(VIU_OSD_BLEND_BLEND0_SIZE,
blend_reg->osd_blend_blend0_size); blend_reg->osd_blend_blend0_size);
/* hdr input size should set to osd blend0 output size */
VSYNCOSD_WR_MPEG_REG(VPP_OSD1_IN_SIZE,
blend_reg->osd_blend_blend0_size);
VSYNCOSD_WR_MPEG_REG(VIU_OSD_BLEND_BLEND1_SIZE, VSYNCOSD_WR_MPEG_REG(VIU_OSD_BLEND_BLEND1_SIZE,
blend_reg->osd_blend_blend1_size); blend_reg->osd_blend_blend1_size);
@@ -8386,6 +8388,10 @@ static void osd_setting_default_hwc(void)
VSYNCOSD_WR_MPEG_REG(VIU_OSD_BLEND_BLEND1_SIZE, VSYNCOSD_WR_MPEG_REG(VIU_OSD_BLEND_BLEND1_SIZE,
blend_vsize << 16 | blend_vsize << 16 |
blend_hsize); blend_hsize);
/* hdr input size should set to osd blend0 output size */
VSYNCOSD_WR_MPEG_REG(VPP_OSD1_IN_SIZE,
blend_vsize << 16 |
blend_hsize);
VSYNCOSD_WR_MPEG_REG_BITS(DOLBY_PATH_CTRL, VSYNCOSD_WR_MPEG_REG_BITS(DOLBY_PATH_CTRL,
0x3, 2, 2); 0x3, 2, 2);
} }