From 0a23a896e344b90895b4df20bf3f2f56d21ac32a Mon Sep 17 00:00:00 2001 From: Dezhi Kong Date: Mon, 2 Sep 2019 19:53:09 +0800 Subject: [PATCH] csc: add vinfo check for csc process [1/1] PD#SWPL-13491 Problem: After plugging and unplugging HDMITX, the panel screen color display is abnormal for dual display platform. Solution: add vinfo->mode check for csc process, avoid process null and invalid vinfo case. Verify: verify by AC202(sm1) Change-Id: I54c54adcf2a0fc9a02e35b0ef24a720a55a8781a Signed-off-by: Dezhi Kong Signed-off-by: Luan Yuan --- drivers/amlogic/media/enhancement/amvecm/amcsc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/media/enhancement/amvecm/amcsc.c b/drivers/amlogic/media/enhancement/amvecm/amcsc.c index eacb845c0107..4297bb09abd1 100644 --- a/drivers/amlogic/media/enhancement/amvecm/amcsc.c +++ b/drivers/amlogic/media/enhancement/amvecm/amcsc.c @@ -6372,7 +6372,8 @@ static int vpp_matrix_update( int hdmi_scs_type_changed = 0; struct hdr10plus_para hdmitx_hdr10plus_param; - if (vinfo == NULL) + if (!vinfo || vinfo->mode == VMODE_NULL || + vinfo->mode == VMODE_INVALID) return 0; /* Tx hdr information */ @@ -6442,7 +6443,9 @@ int amvecm_matrix_process( int i; if ((get_cpu_type() < MESON_CPU_MAJOR_ID_GXTVBB) || - is_meson_gxl_package_905M2() || (csc_en == 0)) + is_meson_gxl_package_905M2() || (csc_en == 0) || + !vinfo || vinfo->mode == VMODE_NULL || + vinfo->mode == VMODE_INVALID) return 0; if (reload_mtx) {