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

Merge "amvecm: fix pq load fail" into amlogic-4.9-dev

Browse Source
This commit is contained in:
Jianxin Pan
2018-02-05 18:29:17 -08:00
committed by Gerrit Code Review
parent 18e836d11a 12c6a8c12a
commit ba61437e80
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/amlogic/media/enhancement/amvecm/amve.c
View File

@@ -3971,10 +3971,12 @@ void ve_enable_dnlp(void)
ve_en = 1;
/* #ifdef NEW_DNLP_IN_SHARPNESS */
/* if(dnlp_sel == NEW_DNLP_IN_SHARPNESS){ */
if (is_meson_gxtvbb_cpu() &&
(dnlp_sel == NEW_DNLP_IN_SHARPNESS))
WRITE_VPP_REG_BITS(SRSHARP0_DNLP_EN, 1, 0, 1);
else
if (dnlp_sel == NEW_DNLP_IN_SHARPNESS) {
if (is_meson_gxlx_cpu())
WRITE_VPP_REG_BITS(SRSHARP1_DNLP_EN, 1, 0, 1);
else
WRITE_VPP_REG_BITS(SRSHARP0_DNLP_EN, 1, 0, 1);
} else
/* #endif */
WRITE_VPP_REG_BITS(VPP_VE_ENABLE_CTRL,
1, DNLP_EN_BIT, DNLP_EN_WID);
@@ -3983,17 +3985,14 @@ void ve_enable_dnlp(void)
void ve_disable_dnlp(void)
{
ve_en = 0;
/* #ifdef NEW_DNLP_IN_SHARPNESS */
/* if(dnlp_sel == NEW_DNLP_IN_SHARPNESS){ */
if (is_meson_gxtvbb_cpu() &&
(dnlp_sel == NEW_DNLP_IN_SHARPNESS))
WRITE_VPP_REG_BITS(SRSHARP0_DNLP_EN, 0, 0, 1);
if (dnlp_sel == NEW_DNLP_IN_SHARPNESS)
if (is_meson_gxlx_cpu())
WRITE_VPP_REG_BITS(SRSHARP1_DNLP_EN, 0, 0, 1);
else
WRITE_VPP_REG_BITS(SRSHARP0_DNLP_EN, 0, 0, 1);
else
/* #endif */
/* { */
WRITE_VPP_REG_BITS(VPP_VE_ENABLE_CTRL,
0, DNLP_EN_BIT, DNLP_EN_WID);
/* } */
}
void ve_set_dnlp(struct ve_dnlp_s *p)

19
drivers/amlogic/media/enhancement/amvecm/arch/ve_regs.h
View File

@@ -526,4 +526,23 @@
#define SRSHARP0_DNLP_15 0x3255
#define SRSHARP0_DEMO_CRTL 0x3256
#define SRSHARP1_DNLP_EN 0x32c5
#define SRSHARP1_DNLP_00 0x32c6
#define SRSHARP1_DNLP_01 0x32c7
#define SRSHARP1_DNLP_02 0x32c8
#define SRSHARP1_DNLP_03 0x32c9
#define SRSHARP1_DNLP_04 0x32ca
#define SRSHARP1_DNLP_05 0x32cb
#define SRSHARP1_DNLP_06 0x32cc
#define SRSHARP1_DNLP_07 0x32cd
#define SRSHARP1_DNLP_08 0x32ce
#define SRSHARP1_DNLP_09 0x32cf
#define SRSHARP1_DNLP_10 0x32d0
#define SRSHARP1_DNLP_11 0x32d1
#define SRSHARP1_DNLP_12 0x32d2
#define SRSHARP1_DNLP_13 0x32d3
#define SRSHARP1_DNLP_14 0x32d4
#define SRSHARP1_DNLP_15 0x32d5
#define SRSHARP1_DEMO_CRTL 0x32d6
#endif /* _VE_REG_H */

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

@@ -4887,7 +4887,8 @@ SET_FILTER:
amvecm_on_vs(
(cur_dispbuf != &vf_local)
? cur_dispbuf : NULL,
vf, CSC_FLAG_CHECK_OUTPUT,
toggle_frame,
toggle_frame ? CSC_FLAG_TOGGLE_FRAME : 0,
cur_frame_par ?
cur_frame_par->supsc1_hori_ratio :
0,