From c24d7e6c2838ced105a62843bdbca5313be9a1f0 Mon Sep 17 00:00:00 2001 From: Jian Cao Date: Sat, 30 Mar 2019 19:25:18 +0800 Subject: [PATCH] osd: add osd TM2 support [1/1] PD#SWPL-6558 Problem: bring up osd for TM2 Solution: osd: add osd TM2 support Verify: Verfied on TM2 skt board Change-Id: I2183bd1f60793baf947c303b6d456e8c69d104ac Signed-off-by: Jian Cao Signed-off-by: Luan Yuan --- drivers/amlogic/media/osd/osd.h | 1 + drivers/amlogic/media/osd/osd_fb.c | 4 ++++ drivers/amlogic/media/osd/osd_hw.c | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/media/osd/osd.h b/drivers/amlogic/media/osd/osd.h index cc2e8fb..2884b1f 100644 --- a/drivers/amlogic/media/osd/osd.h +++ b/drivers/amlogic/media/osd/osd.h @@ -278,6 +278,7 @@ enum cpuid_type_e { __MESON_CPU_MAJOR_ID_G12B, __MESON_CPU_MAJOR_ID_TL1, __MESON_CPU_MAJOR_ID_SM1, + __MESON_CPU_MAJOR_ID_TM2, __MESON_CPU_MAJOR_ID_UNKNOWN, }; diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c index 356e3a3..71a881e2 100644 --- a/drivers/amlogic/media/osd/osd_fb.c +++ b/drivers/amlogic/media/osd/osd_fb.c @@ -4084,6 +4084,10 @@ static const struct of_device_id meson_fb_dt_match[] = { .compatible = "amlogic, meson-sm1", .data = &osd_sm1, }, + { + .compatible = "amlogic, meson-tm2", + .data = &osd_tm2, + }, {}, }; diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 297e504..c271c42 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -1680,6 +1680,7 @@ static u32 osd_get_hw_reset_flag(void) case __MESON_CPU_MAJOR_ID_G12B: case __MESON_CPU_MAJOR_ID_TL1: case __MESON_CPU_MAJOR_ID_SM1: + case __MESON_CPU_MAJOR_ID_TM2: { int i, afbc_enable = 0; @@ -5052,8 +5053,7 @@ static void osd_update_disp_osd_rotate(u32 index) const struct vinfo_s *vinfo; int out_y_crop_start, out_y_crop_end; - if (osd_hw.osd_meson_dev.cpu_id < __MESON_CPU_MAJOR_ID_G12B || - osd_hw.osd_meson_dev.cpu_id == __MESON_CPU_MAJOR_ID_SM1) + if (osd_hw.osd_meson_dev.cpu_id != __MESON_CPU_MAJOR_ID_G12B) return; src_fmt = get_viu2_src_format(); src_data.x = 0; -- 2.7.4