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

pq: fix sr registers load fail on txl [1/1]

Browse Source 
PD#SWPL-2941

Problem:
sr top ctrl is closed when video off

Solution:
txl and txl sr top don't close

Verify:
TxL

Change-Id: Ia8e7e3bd93dd328497af66cf9758e3021cafe22c
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
This commit is contained in:
Bencheng Jing
2018-12-06 16:53:17 +08:00
committed by Jianxin Pan
parent 5a189ac9fb
commit 81bc3489b9
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/amlogic/media/enhancement/amvecm/amvecm.c
View File

@@ -5643,7 +5643,10 @@ void init_pq_setting(void)
}
/*probe close sr0 peaking for switch on video*/
WRITE_VPP_REG_BITS(VPP_SRSHARP0_CTRL, 1, 0, 1);
WRITE_VPP_REG_BITS(VPP_SRSHARP1_CTRL, 0, 0, 1);
if (cpu_after_eq(MESON_CPU_MAJOR_ID_TL1))
WRITE_VPP_REG_BITS(VPP_SRSHARP1_CTRL, 0, 0, 1);
else
WRITE_VPP_REG_BITS(VPP_SRSHARP1_CTRL, 1, 0, 1);
/*default dnlp off*/
WRITE_VPP_REG_BITS(SRSHARP0_PK_NR_ENABLE + sr_offset[0],
0, 1, 1);

7
drivers/amlogic/media/video_sink/video.c
View File

@@ -6401,8 +6401,11 @@ SET_FILTER:
vpp_misc_set &= ~(VPP_VD2_PREBLEND |
VPP_VD2_POSTBLEND | VPP_PREBLEND_EN);
/*auto disable sr when video off*/
VSYNC_WR_MPEG_REG(VPP_SRSHARP0_CTRL, 0);
VSYNC_WR_MPEG_REG(VPP_SRSHARP1_CTRL, 0);
if (!is_meson_txl_cpu() &&
!is_meson_txlx_cpu()) {
VSYNC_WR_MPEG_REG(VPP_SRSHARP0_CTRL, 0);
VSYNC_WR_MPEG_REG(VPP_SRSHARP1_CTRL, 0);
}
video_onoff_state = VIDEO_ENABLE_STATE_IDLE;
video_onoff_time = jiffies_to_msecs(jiffies);
vpu_delay_work_flag |=