From 1f9ef82124e041f8e11348c079902e145e42187e Mon Sep 17 00:00:00 2001 From: Pengcheng Chen Date: Mon, 8 Jul 2019 15:43:14 +0800 Subject: [PATCH] osd: add viu2 support for sm1 and tm2 [1/1] PD#SWPL-10934 Problem: viu2 not support for sm1 Solution: add viu2 support for sm1 and tm2 Verify: verified on sm1 Change-Id: I3988a84b64b952a76b1b262227e11682f28c7cdd Signed-off-by: Pengcheng Chen --- drivers/amlogic/media/osd/osd_hw.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 2006418a28e8..d334490aa083 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -982,23 +982,10 @@ u32 get_output_device_id(u32 index) u32 output_index = VIU1; if (osd_hw.osd_meson_dev.has_viu2) { - switch (osd_hw.osd_meson_dev.cpu_id) { - case __MESON_CPU_MAJOR_ID_G12A: - case __MESON_CPU_MAJOR_ID_G12B: - if (index == osd_hw.osd_meson_dev.viu2_index) - output_index = VIU2; - else - output_index = VIU1; - break; - case __MESON_CPU_MAJOR_ID_TL1: - if (index == osd_hw.osd_meson_dev.viu2_index) - output_index = VIU2; - else - output_index = VIU1; - break; - default: - break; - } + if (index == osd_hw.osd_meson_dev.viu2_index) + output_index = VIU2; + else + output_index = VIU1; } return output_index; }