Skip to content

Commit

Permalink
Add 1200p vmode for customer. Note to self: assuming HSPULS_END is vs…
Browse files Browse the repository at this point in the history 
…ync + backporch. Need to verify..

Signed-off-by: Sam Nazarko <email@samnazarko.co.uk>
  • Loading branch information
@samnazarko
samnazarko committed Jul 25, 2016
1 parent 1c49c43 commit 5f29a23
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 0 deletions.
64 changes: 64 additions & 0 deletions arch/arm/mach-meson8b/include/mach/tvregs.h
View file
Expand Up @@ -1047,6 +1047,68 @@ static const reg_t tvregs_1080p_24hz[] = {
{MREG_END_MARKER, 0 }
};

static const reg_t tvregs_1200p[] = {
{P_ENCP_VIDEO_EN, 0, },
{P_ENCI_VIDEO_EN, 0, },
{P_VENC_VDAC_SETTING, 0xff, },

{P_HHI_VID_CLK_CNTL, 0x0,},
{P_HHI_VID_PLL_CNTL2, 0x814d3928},
{P_HHI_VID_PLL_CNTL3, 0x6b425012},
{P_HHI_VID_PLL_CNTL4, 0x110},
{P_HHI_VID_PLL_CNTL, 0x0001043e,},
{P_HHI_VID_DIVIDER_CNTL, 0x00010843,},
{P_HHI_VID_CLK_DIV, 0x100},
{P_HHI_VID_CLK_CNTL, 0x80000,},
{P_HHI_VID_CLK_CNTL, 0x88001,},
{P_HHI_VID_CLK_CNTL, 0x80003,},
{P_HHI_VIID_CLK_DIV, 0x00000101,},


{P_ENCP_VIDEO_FILT_CTRL, 0x1052,},
{P_VENC_DVI_SETTING, 0x0001,},
{P_ENCP_VIDEO_MODE, 0x4040,},
{P_ENCP_VIDEO_MODE_ADV, 0x0018,},
{P_ENCP_VIDEO_YFP1_HTIME, 128, }, // h front porch
{P_ENCP_VIDEO_YFP2_HTIME, 2400, },
{P_ENCP_VIDEO_MAX_PXCNT, 2592, }, // total pixels
{P_ENCP_VIDEO_HSPULS_BEGIN, 2156, },
{P_ENCP_VIDEO_HSPULS_END, 41, }, // vsync + bp
{P_ENCP_VIDEO_HSPULS_SWITCH, 41, },
{P_ENCP_VIDEO_VSPULS_BEGIN, 140, },
{P_ENCP_VIDEO_VSPULS_END, 2059, },
{P_ENCP_VIDEO_VSPULS_BLINE, 0, },
{P_ENCP_VIDEO_VSPULS_ELINE, 4, },//35
{P_ENCP_VIDEO_HAVON_BEGIN, 148, },
{P_ENCP_VIDEO_HAVON_END, 2067, },
{P_ENCP_VIDEO_VAVON_BLINE, 41, },
{P_ENCP_VIDEO_VAVON_ELINE, 1120, },
{P_ENCP_VIDEO_HSO_BEGIN, 41, },
{P_ENCP_VIDEO_HSO_END, 2156, },
{P_ENCP_VIDEO_VSO_BEGIN, 2100, },
{P_ENCP_VIDEO_VSO_END, 2164, },
{P_ENCP_VIDEO_VSO_BLINE, 0, },
{P_ENCP_VIDEO_VSO_ELINE, 5, },
{P_ENCP_VIDEO_MAX_LNCNT, 1242, }, // [TOTAL V LINES]
{P_VENC_VIDEO_PROG_MODE, 0x100, },
{P_VENC_SYNC_ROUTE, 0, },
{P_VENC_INTCTRL, 0x200, },
{P_ENCP_VFIFO2VD_CTL, 0, },
{P_VENC_VDAC_SETTING, 0, },
{P_VENC_VDAC_DACSEL0, 0x0001,},
{P_VENC_VDAC_DACSEL1, 0x0001,},
{P_VENC_VDAC_DACSEL2, 0x0001,},
{P_VENC_VDAC_DACSEL3, 0x0001,},
{P_VENC_VDAC_DACSEL4, 0x0001,},
{P_VENC_VDAC_DACSEL5, 0x0001,},
{P_VENC_VDAC_FIFO_CTRL, 0x1000,},
{P_ENCP_DACSEL_0, 0x3102,},
{P_ENCP_DACSEL_1, 0x0054,},
{P_ENCI_VIDEO_EN, 0, },
{P_ENCP_VIDEO_EN, 1, },
{MREG_END_MARKER, 0 }
};

static const reg_t tvregs_4k2k_30hz[] = {
{P_ENCP_VIDEO_EN, 0, },
{P_ENCI_VIDEO_EN, 0, },
Expand Down Expand Up @@ -1470,6 +1532,7 @@ static struct tvregs_set_t tvregsTab[] = {
{TVMODE_1080I_50HZ, tvregs_1080i_50hz},
{TVMODE_1080P_50HZ, tvregs_1080p_50hz},
{TVMODE_1080P_24HZ, tvregs_1080p_24hz},
{TVMODE_1200P, tvregs_1200p},
{TVMODE_4K2K_30HZ, tvregs_4k2k_30hz},
{TVMODE_4K2K_25HZ, tvregs_4k2k_25hz},
{TVMODE_4K2K_24HZ, tvregs_4k2k_24hz},
Expand Down Expand Up @@ -1506,6 +1569,7 @@ static const tvinfo_t tvinfoTab[] = {
{.tvmode = TVMODE_1080I_50HZ, .xres = 1920, .yres = 1080, .id = "1080i50hz"},
{.tvmode = TVMODE_1080P_50HZ, .xres = 1920, .yres = 1080, .id = "1080p50hz"},
{.tvmode = TVMODE_1080P_24HZ, .xres = 1920, .yres = 1080, .id = "1080p24hz"},
{.tvmode = TVMODE_1200P, .xres = 1900, .yres = 1200, .id = "1200p"},
{.tvmode = TVMODE_4K2K_30HZ, .xres = 3840, .yres = 2160, .id = "4k2k30hz"},
{.tvmode = TVMODE_4K2K_25HZ, .xres = 3840, .yres = 2160, .id = "4k2k25hz"},
{.tvmode = TVMODE_4K2K_24HZ, .xres = 3840, .yres = 2160, .id = "4k2k24hz"},
Expand Down
1 change: 1 addition & 0 deletions drivers/amlogic/display/vout/enc_clk_config.c
View file
Expand Up @@ -503,6 +503,7 @@ static enc_clk_val_t setting_enc_clk_val_m8m2[] = {
{VMODE_1080I, 2970, 4, 2, 1, VIU_ENCP, 10, 1, 2, 1, -1, -1, -1, 1, -1},
{VMODE_1080P, 2970, 2, 2, 1, VIU_ENCP, 10, 1, 1, 1, -1, -1, -1, 1, -1},
{VMODE_1080P, 2970, 2, 2, 1, VIU_ENCP, 10, 1, 1, 1, -1, -1, -1, 1, -1},
{VMODE_1200P, 2970, 2, 2, 1, VIU_ENCP, 10, 1, 1, 1, -1, -1, -1, 1, -1},
{VMODE_720P_50HZ, 2970, 4, 2, 1, VIU_ENCP, 10, 1, 2, 1, -1, -1, -1, 1, -1},
{VMODE_1080I_50HZ, 2970, 4, 2, 1, VIU_ENCP, 10, 1, 2, 1, -1, -1, -1, 1, -1},
{VMODE_1080P_50HZ, 2970, 2, 2, 1, VIU_ENCP, 10, 1, 1, 1, -1, -1, -1, 1, -1},
Expand Down
1 change: 1 addition & 0 deletions drivers/amlogic/display/vout/tvconf.c
View file
Expand Up @@ -105,6 +105,7 @@ static struct vmode_tvmode_tab_t mode_tab[] = {
{TVMODE_720P, VMODE_720P},
{TVMODE_1080I, VMODE_1080I},
{TVMODE_1080P, VMODE_1080P},
{TVMODE_1200P, VMODE_1200P},
{TVMODE_720P_50HZ, VMODE_720P_50HZ},
{TVMODE_1080I_50HZ, VMODE_1080I_50HZ},
{TVMODE_1080P_50HZ, VMODE_1080P_50HZ},
Expand Down
2 changes: 2 additions & 0 deletions include/linux/amlogic/vout/vinfo.h
View file
Expand Up @@ -61,6 +61,7 @@ typedef enum {
VMODE_1080I_50HZ ,
VMODE_1080P_50HZ ,
VMODE_1080P_24HZ ,
VMODE_1200P,
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
VMODE_1080P_23HZ , // for framerate automation 1080p 23.97hz
#endif
Expand Down Expand Up @@ -134,6 +135,7 @@ typedef enum {
TVMODE_1080I_50HZ ,
TVMODE_1080P_50HZ ,
TVMODE_1080P_24HZ ,
TVMODE_1200P,
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
TVMODE_1080P_23HZ , // for framerate automation 1080p 23.97hz
#endif
Expand Down

0 comments on commit 5f29a23

Please sign in to comment.