From e15c9a6a33c1665444865bfe744541987979b0ae Mon Sep 17 00:00:00 2001 From: MingLiang Dong Date: Tue, 11 Dec 2018 05:37:04 -0500 Subject: [PATCH] hdr: Enable default output to HDR for HDR TV [1/1] PD#SWPL-3096 Problem: G12A/G12B need enable sdr2hdr Solution: enable sdr2hdr function Verify: verify on G12A Change-Id: I1e771a13d33fe675cfc36d8308afc37077545cd4 Signed-off-by: MingLiang Dong --- drivers/amlogic/media/enhancement/amvecm/amcsc.c | 6 ++---- drivers/amlogic/media/enhancement/amvecm/amvecm.c | 11 ++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/amlogic/media/enhancement/amvecm/amcsc.c b/drivers/amlogic/media/enhancement/amvecm/amcsc.c index 4b37921..08953cc 100644 --- a/drivers/amlogic/media/enhancement/amvecm/amcsc.c +++ b/drivers/amlogic/media/enhancement/amvecm/amcsc.c @@ -5948,10 +5948,8 @@ static void hdr_support_process(struct vinfo_s *vinfo) if (sdr_mode == 2) { /* auto */ if ((vinfo->hdr_info.hdr_support & 0x4) && - ((get_cpu_type() == MESON_CPU_MAJOR_ID_GXL) || - (get_cpu_type() == MESON_CPU_MAJOR_ID_GXM) || - (get_cpu_type() == MESON_CPU_MAJOR_ID_GXLX) || - (get_cpu_type() == MESON_CPU_MAJOR_ID_G12A))) + ((cpu_after_eq(MESON_CPU_MAJOR_ID_GXL)) && + (vinfo->viu_color_fmt != COLOR_FMT_RGB444))) sdr_process_mode = 1; /*box sdr->hdr*/ else if ((vinfo->viu_color_fmt == COLOR_FMT_RGB444) && ((get_cpu_type() == MESON_CPU_MAJOR_ID_GXTVBB) || diff --git a/drivers/amlogic/media/enhancement/amvecm/amvecm.c b/drivers/amlogic/media/enhancement/amvecm/amvecm.c index 8a006fe..a0125ab 100644 --- a/drivers/amlogic/media/enhancement/amvecm/amvecm.c +++ b/drivers/amlogic/media/enhancement/amvecm/amvecm.c @@ -6057,13 +6057,14 @@ static int aml_vecm_probe(struct platform_device *pdev) /* box sdr_mode:auto, tv sdr_mode:off */ /* disable contrast and saturation adjustment for HDR on TV */ /* disable SDR to HDR convert on TV */ - if (is_meson_gxl_cpu() || is_meson_gxm_cpu()) { - sdr_mode = 0; + if (is_meson_gxl_cpu() || is_meson_gxm_cpu()) hdr_flag = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3); - } else { - sdr_mode = 0; + 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*/ -- 2.7.4