From c796bc6aefef9911d30f05e00fe8e3d7244b0271 Mon Sep 17 00:00:00 2001 From: Joy Cho Date: Mon, 4 Jan 2021 17:57:54 +0900 Subject: [PATCH] ODROID-COMMON: osd: Adjust vertical osd scaler setting Change-Id: I4d04daf48321b28a30a561ef30a87cdba2fbc7cc --- drivers/amlogic/media/osd/osd_hw.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index d8581e8902a6..16cb31320b3b 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -7144,7 +7144,12 @@ static void osd_set_freescale(u32 index, else osd_hw.free_scale[index].h_enable = 0; - if (dst_height > 1080) + /* + * On amlogic hwcomposer, fb size is limited to 1920x1080 + * in case of higher resolution over 2560x1080. + * Other cases, native vertical size is used. + */ + if ((dst_height > 1080) && (dst_width >= 2560)) osd_hw.free_scale[index].v_enable = 1; else osd_hw.free_scale[index].v_enable = 0;