From b74aa0619cbde6d82f973e3ff691e702842d84e1 Mon Sep 17 00:00:00 2001 From: MingLiang Dong Date: Wed, 16 Jan 2019 01:36:29 -0500 Subject: [PATCH] amvecm: sdr2hdr function set by uplayer, driver default disable [1/1] PD#SWPL-4255 Problem: UI disable SDR TO HDR, reboot BOX, TV flicker white and then display ok when connect hdr tv Solution: dr2hdr function set by uplayer, kernel default disable Verify: verify on G12A Change-Id: Iea5a1e0be9b5665bb7deb785b6b5faa702ef1664 Signed-off-by: MingLiang Dong Conflicts: drivers/amlogic/media/enhancement/amvecm/amvecm.c --- drivers/amlogic/media/enhancement/amvecm/amvecm.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/amlogic/media/enhancement/amvecm/amvecm.c b/drivers/amlogic/media/enhancement/amvecm/amvecm.c index 69bc6a6c0821..ee7374135e76 100644 --- a/drivers/amlogic/media/enhancement/amvecm/amvecm.c +++ b/drivers/amlogic/media/enhancement/amvecm/amvecm.c @@ -6666,21 +6666,9 @@ static int aml_vecm_probe(struct platform_device *pdev) else hdr_flag = (1 << 0) | (1 << 1) | (0 << 2) | (0 << 3); - if (is_meson_g12a_cpu() || is_meson_g12b_cpu()) - sdr_mode = 2; - - /*config vlock mode*/ - /*todo:txlx & g9tv support auto pll,*/ - /*but support not good,need vlsi support optimize*/ - vlock_mode = VLOCK_MODE_MANUAL_PLL; - if (is_meson_gxtvbb_cpu() || - is_meson_txl_cpu() || is_meson_txlx_cpu() - || is_meson_txhd_cpu()) - vlock_en = 1; - else - vlock_en = 0; hdr_init(&amvecm_dev.hdr_d); aml_vecm_dt_parse(pdev); + vlock_status_init(); probe_ok = 1; pr_info("%s: ok\n", __func__);