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

dv: fix osd color matrix when dv enabled [1/1]

Browse Source 
PD#SWPL-1804

Problem:
fix osd color matrix when dv enabled

Solution:
enable osd matrix when dv enabled

Verify:
verified on u212 dev board

Change-Id: I4b4206f4d8c447873f23a3a0066af0d0fa85e18c
Signed-off-by: Yi Zhou <yi.zhou@amlogic.com>
This commit is contained in:
Yi Zhou
2018-11-23 14:37:32 +08:00
committed by Jianxin Pan
parent eda95208fc
commit 130e79eb14
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c
View File

@@ -2602,6 +2602,10 @@ void enable_dolby_vision(int enable)
0, 3, 1); /* bypass core3 */
VSYNC_WR_MPEG_REG(VPP_WRAP_OSD1_MATRIX_EN_CTRL,
0x0);
VSYNC_WR_MPEG_REG(VPP_WRAP_OSD2_MATRIX_EN_CTRL,
0x0);
VSYNC_WR_MPEG_REG(VPP_WRAP_OSD3_MATRIX_EN_CTRL,
0x0);
if (dolby_vision_mask & 2)
VSYNC_WR_MPEG_REG_BITS(
DOLBY_PATH_CTRL,
@@ -2851,6 +2855,10 @@ void enable_dolby_vision(int enable)
} else if (is_meson_g12()) {
VSYNC_WR_MPEG_REG(VPP_WRAP_OSD1_MATRIX_EN_CTRL,
0x1);
VSYNC_WR_MPEG_REG(VPP_WRAP_OSD2_MATRIX_EN_CTRL,
0x1);
VSYNC_WR_MPEG_REG(VPP_WRAP_OSD3_MATRIX_EN_CTRL,
0x1);
VSYNC_WR_MPEG_REG_BITS(
DOLBY_PATH_CTRL,
(1 << 2) | /* core2 bypass */

2
drivers/amlogic/media/enhancement/amvecm/arch/vpp_dolbyvision_regs.h
View File

@@ -66,6 +66,8 @@
#define DOLBY_CORE3_INPUT_CSC_CRC 0x36fc
#define DOLBY_CORE3_OUTPUT_CSC_CRC 0x36fd
#define VPP_WRAP_OSD1_MATRIX_EN_CTRL 0x3d6d
#define VPP_WRAP_OSD2_MATRIX_EN_CTRL 0x3d7d
#define VPP_WRAP_OSD3_MATRIX_EN_CTRL 0x3dbd
#define DOLBY_PATH_CTRL 0x1a0c
#define VIU_MISC_CTRL1 0x1a07