From e3701d133e624c5bbded2a2691d25a08678ac038 Mon Sep 17 00:00:00 2001 From: "huaihao.guo" Date: Fri, 2 Nov 2018 19:10:19 +0800 Subject: [PATCH] deinterface: add afbc support on g12a and txlx [1/1] PD#SWPL-1618 Problem: Add afbc support on g12a and txlx Solution: add afbc support on g12a and txlx Verify: T962X-R311, U200(G12A) Change-Id: Ia0cce8516a98653b01c3bc628e812c3a81b1df59 Signed-off-by: huaihao.guo Conflicts: drivers/amlogic/media/deinterlace/deinterlace.c drivers/amlogic/media/deinterlace/deinterlace_hw.c --- drivers/amlogic/media/deinterlace/deinterlace.c | 2 +- drivers/amlogic/media/deinterlace/deinterlace_hw.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/amlogic/media/deinterlace/deinterlace.c b/drivers/amlogic/media/deinterlace/deinterlace.c index 355aaa3c22bc..7544b5200968 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace.c +++ b/drivers/amlogic/media/deinterlace/deinterlace.c @@ -129,7 +129,7 @@ static di_dev_t *de_devp; static dev_t di_devno; static struct class *di_clsp; -static const char version_s[] = "2019-03-18a"; +static const char version_s[] = "2018-11-06a"; static int bypass_state = 1; static int bypass_all; diff --git a/drivers/amlogic/media/deinterlace/deinterlace_hw.c b/drivers/amlogic/media/deinterlace/deinterlace_hw.c index 3918d70e8680..32d3b050fcd6 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace_hw.c +++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.c @@ -1007,9 +1007,9 @@ bool afbc_is_supported(void) /*currently support txlx and g12a*/ if (is_meson_txlx_cpu() - || is_meson_g12a_cpu() - /*|| is_meson_tl1_cpu()*/) - ret = false; + || cpu_after_eq(MESON_CPU_MAJOR_ID_G12A)) + ret = true; + return ret; }