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

osd: set osd1 scaler before osd blend [1/1]

Browse Source 
PD#SWPL-6596

Problem:
bring up osd for TM2

Solution:
set osd1 scaler before osd blend

Verify:
Verified on T962e2_ab319

Change-Id: I9e7d5fa83b2edc8e9359371695ea46fa3b39e09c
Signed-off-by: Pengcheng Chen <pengcheng.chen@amlogic.com>
This commit is contained in:
Pengcheng Chen
2019-03-29 17:16:22 +08:00
committed by Jianxiong Pan
parent 3cd1a565d7
commit 7bcfa1847f
4 changed files with 600 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,6 +510,7 @@ struct osd_device_data_s {
u32 vpp_fifo_len; u32 vpp_fifo_len;
u32 dummy_data; u32 dummy_data;
u32 has_viu2; u32 has_viu2;
u32 osd0_sc_independ;
u32 viu1_osd_count; u32 viu1_osd_count;
u32 viu2_index; u32 viu2_index;
struct clk *vpu_clkc; struct clk *vpu_clkc;

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

@@ -3740,6 +3740,7 @@ static struct osd_device_data_s osd_gxbb = {
.vpp_fifo_len = 0x77f, .vpp_fifo_len = 0x77f,
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_gxtvbb = { static struct osd_device_data_s osd_gxtvbb = {
@@ -3755,6 +3756,7 @@ static struct osd_device_data_s osd_gxtvbb = {
.vpp_fifo_len = 0xfff, .vpp_fifo_len = 0xfff,
.dummy_data = 0x0, .dummy_data = 0x0,
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_gxl = { static struct osd_device_data_s osd_gxl = {
@@ -3770,6 +3772,7 @@ static struct osd_device_data_s osd_gxl = {
.vpp_fifo_len = 0x77f, .vpp_fifo_len = 0x77f,
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_gxm = { static struct osd_device_data_s osd_gxm = {
@@ -3785,6 +3788,7 @@ static struct osd_device_data_s osd_gxm = {
.vpp_fifo_len = 0xfff, .vpp_fifo_len = 0xfff,
.dummy_data = 0x00202000,/* dummy data is different */ .dummy_data = 0x00202000,/* dummy data is different */
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_txl = { static struct osd_device_data_s osd_txl = {
@@ -3800,6 +3804,7 @@ static struct osd_device_data_s osd_txl = {
.vpp_fifo_len = 0x77f, .vpp_fifo_len = 0x77f,
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_txlx = { static struct osd_device_data_s osd_txlx = {
@@ -3815,6 +3820,7 @@ static struct osd_device_data_s osd_txlx = {
.vpp_fifo_len = 0x77f, .vpp_fifo_len = 0x77f,
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_axg = { static struct osd_device_data_s osd_axg = {
@@ -3831,6 +3837,7 @@ static struct osd_device_data_s osd_axg = {
.vpp_fifo_len = 0x400, .vpp_fifo_len = 0x400,
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 0, .has_viu2 = 0,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_g12a = { static struct osd_device_data_s osd_g12a = {
@@ -3846,6 +3853,7 @@ static struct osd_device_data_s osd_g12a = {
.vpp_fifo_len = 0xfff,/* 2048 */ .vpp_fifo_len = 0xfff,/* 2048 */
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 1, .has_viu2 = 1,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_g12b = { static struct osd_device_data_s osd_g12b = {
@@ -3861,6 +3869,7 @@ static struct osd_device_data_s osd_g12b = {
.vpp_fifo_len = 0xfff,/* 2048 */ .vpp_fifo_len = 0xfff,/* 2048 */
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 1, .has_viu2 = 1,
.osd0_sc_independ = 0,
}; };
static struct osd_device_data_s osd_tl1 = { static struct osd_device_data_s osd_tl1 = {
@@ -3876,21 +3885,7 @@ static struct osd_device_data_s osd_tl1 = {
.vpp_fifo_len = 0xfff,/* 2048 */ .vpp_fifo_len = 0xfff,/* 2048 */
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 1, .has_viu2 = 1,
}; .osd0_sc_independ = 0,
static struct osd_device_data_s osd_tm2 = {
.cpu_id = __MESON_CPU_MAJOR_ID_TM2,
.osd_ver = OSD_HIGH_ONE,
.afbc_type = MALI_AFBC,
.osd_count = 4,
.has_deband = 1,
.has_lut = 1,
.has_rdma = 1,
.has_dolby_vision = 0,
.osd_fifo_len = 64, /* fifo len 64*8 = 512 */
.vpp_fifo_len = 0xfff,/* 2048 */
.dummy_data = 0x00808000,
.has_viu2 = 1,
}; };
static struct osd_device_data_s osd_sm1 = { static struct osd_device_data_s osd_sm1 = {
@@ -3906,6 +3901,23 @@ static struct osd_device_data_s osd_sm1 = {
.vpp_fifo_len = 0xfff,/* 2048 */ .vpp_fifo_len = 0xfff,/* 2048 */
.dummy_data = 0x00808000, .dummy_data = 0x00808000,
.has_viu2 = 1, .has_viu2 = 1,
.osd0_sc_independ = 0,
};
static struct osd_device_data_s osd_tm2 = {
.cpu_id = __MESON_CPU_MAJOR_ID_TM2,
.osd_ver = OSD_HIGH_ONE,
.afbc_type = MALI_AFBC,
.osd_count = 4,
.has_deband = 1,
.has_lut = 1,
.has_rdma = 1,
.has_dolby_vision = 0,
.osd_fifo_len = 64, /* fifo len 64*8 = 512 */
.vpp_fifo_len = 0xfff,/* 2048 */
.dummy_data = 0x00808000,
.has_viu2 = 1,
.osd0_sc_independ = 1,
}; };
static const struct of_device_id meson_fb_dt_match[] = { static const struct of_device_id meson_fb_dt_match[] = {
@@ -4003,7 +4015,6 @@ static int osd_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
} }
/* get interrupt resource */ /* get interrupt resource */
int_viu_vsync = platform_get_irq_byname(pdev, "viu-vsync"); int_viu_vsync = platform_get_irq_byname(pdev, "viu-vsync");
if (int_viu_vsync == -ENXIO) { if (int_viu_vsync == -ENXIO) {

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

File diff suppressed because it is too large Load Diff

2
drivers/amlogic/media/osd/osd_reg.h
View File

@@ -392,7 +392,7 @@
#define VPP_OSD_SCALE_COEF_IDX 0x1dcc #define VPP_OSD_SCALE_COEF_IDX 0x1dcc
#define VPP_OSD_SCALE_COEF 0x1dcd #define VPP_OSD_SCALE_COEF 0x1dcd
#define VPP_INT_LINE_NUM 0x1dce #define VPP_INT_LINE_NUM 0x1dce
#define VPP_OSD_SCALE_CTRL 0x1dff
/* osd2 scaler */ /* osd2 scaler */
#define OSD2_VSC_PHASE_STEP 0x3d00 #define OSD2_VSC_PHASE_STEP 0x3d00
#define OSD2_VSC_INI_PHASE 0x3d01 #define OSD2_VSC_INI_PHASE 0x3d01