From 4f8278dcc17d5c36793ff09b3e26ae83be28b485 Mon Sep 17 00:00:00 2001 From: yao liu Date: Tue, 19 Nov 2019 16:27:21 +0800 Subject: [PATCH] dv: graphic blend test failed [1/1] PD#SWPL-16994 Problem: DV in/DV out case, gmax is high Solution: Set gmax to 300 for DV in/DV out case By the way, remove err code in osd Verify: SM1 Change-Id: I9b73d57d424dc7609d284811c01a0d809d49c974 Signed-off-by: yao liu --- .../amlogic/media/enhancement/amdolby_vision/amdolby_vision.c | 4 ++-- drivers/amlogic/media/osd/osd_fb.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c index 194c90181538..7123712fb83b 100644 --- a/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c +++ b/drivers/amlogic/media/enhancement/amdolby_vision/amdolby_vision.c @@ -336,12 +336,12 @@ module_param(dv_graphic_blend_test, uint, 0664); MODULE_PARM_DESC(dv_graphic_blend_test, "\n dv_graphic_blend_test\n"); static unsigned int dv_target_graphics_max[3][3] = { - { 400, 316, 380 }, /* DOVI => DOVI/HDR/SDR */ + { 300, 316, 380 }, /* DOVI => DOVI/HDR/SDR */ { 300, 316, 100 }, /* HDR => DOVI/HDR/SDR */ { 300, 316, 100 }, /* SDR => DOVI/HDR/SDR */ }; static unsigned int dv_target_graphics_LL_max[3][3] = { - { 400, 316, 100 }, /* DOVI => DOVI/HDR/SDR */ + { 300, 316, 100 }, /* DOVI => DOVI/HDR/SDR */ { 210, 316, 100 }, /* HDR => DOVI/HDR/SDR */ { 300, 316, 100 }, /* SDR => DOVI/HDR/SDR */ }; diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c index 354d273ff16c..5da35272c8e2 100644 --- a/drivers/amlogic/media/osd/osd_fb.c +++ b/drivers/amlogic/media/osd/osd_fb.c @@ -4281,7 +4281,6 @@ static int osd_probe(struct platform_device *pdev) prop = of_get_property(pdev->dev.of_node, "scale_mode", NULL); if (prop) prop_idx = of_read_ulong(prop, 1); - prop_idx = 0; /* Todo: only osd0 */ osd_set_free_scale_mode_hw(DEV_OSD0, prop_idx); prop_idx = 0; -- 2.20.1