shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: add osd TM2 support [1/1]

Browse Source 
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 <jian.cao@amlogic.com>
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
This commit is contained in:
Jian Cao
2019-03-30 19:25:18 +08:00
committed by Luan Yuan
parent ab88b5cf83
commit f69c173336
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/amlogic/media/osd/osd.h
View File

@@ -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,
};

4
drivers/amlogic/media/osd/osd_fb.c
View File

@@ -4037,6 +4037,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,
},
{},
};

4
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -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;