diff options
| author | Anders Bauer <anders.bauer@stericsson.com> | 2012-01-10 12:28:15 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:25 +0200 |
| commit | 6f99b48c3f644ce08db9b8cbd62a87f39da42707 (patch) | |
| tree | 0e288843f760b704471002554892d9bcc4e183e0 | |
| parent | 73efbbbbfa125389e7d80cbae160557b26e3f16e (diff) | |
ux500: mcde: remove synchronized_update
The synchronized_update parameter is
removed and replaced by SYNCSRC_OFF
when disabling vertical synchronization
for display.
ST-Ericsson ID: 405619
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I3e7323b507266706edddc693cdf20da6079ae7f4
Signed-off-by: Anders Bauer <anders.bauer@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45036
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Tested-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig-arch | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 24 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 6 |
3 files changed, 13 insertions, 23 deletions
diff --git a/arch/arm/mach-ux500/Kconfig-arch b/arch/arm/mach-ux500/Kconfig-arch index d05ab5a80d4..45fc2716814 100644 --- a/arch/arm/mach-ux500/Kconfig-arch +++ b/arch/arm/mach-ux500/Kconfig-arch @@ -45,12 +45,6 @@ config MCDE_DISPLAY_PRIMARY_32BPP endchoice -config DISPLAY_GENERIC_DSI_PRIMARY_VSYNC - bool "Enable v-sync for primary display" - default n - help - Say yes to enable v-sync for primary display - config DISPLAY_AV8100_TRIPPLE_BUFFER bool "Enable tripple buffer for HDMI display" depends on MCDE_DISPLAY_AV8100 diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index b90bf78c60d..36bbe12863a 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -89,6 +89,10 @@ static struct mcde_col_transform rgb_2_yCbCr_transform = { }; #endif +static struct mcde_port samsung_s6d16d0_port0 = { + .sync_src = MCDE_SYNCSRC_BTA, +}; + static struct mcde_display_dsi_platform_data samsung_s6d16d0_pdata0 = { .link = 0, }; @@ -96,14 +100,10 @@ static struct mcde_display_dsi_platform_data samsung_s6d16d0_pdata0 = { static struct mcde_display_device samsung_s6d16d0_display0 = { .name = "samsung_s6d16d0", .id = PRIMARY_DISPLAY_ID, + .port = &samsung_s6d16d0_port0, .chnl_id = MCDE_CHNL_A, .fifo = MCDE_FIFO_A, .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, -#ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC - .synchronized_update = true, -#else - .synchronized_update = false, -#endif .dev = { .platform_data = &samsung_s6d16d0_pdata0, }, @@ -111,6 +111,7 @@ static struct mcde_display_device samsung_s6d16d0_display0 = { static struct mcde_port sony_port0 = { .link = 0, + .sync_src = MCDE_SYNCSRC_BTA, }; static struct mcde_display_sony_acx424akp_platform_data @@ -126,16 +127,15 @@ static struct mcde_display_device sony_acx424akp_display0 = { .fifo = MCDE_FIFO_A, .orientation = MCDE_DISPLAY_ROT_180_CW, .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, -#ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC - .synchronized_update = true, -#else - .synchronized_update = false, -#endif .dev = { .platform_data = &sony_acx424akp_display0_pdata, }, }; +static struct mcde_port samsung_s6d16d0_port1 = { + .sync_src = MCDE_SYNCSRC_BTA, +}; + static struct mcde_display_dsi_platform_data samsung_s6d16d0_pdata1 = { .link = 1, }; @@ -143,11 +143,11 @@ static struct mcde_display_dsi_platform_data samsung_s6d16d0_pdata1 = { static struct mcde_display_device samsung_s6d16d0_display1 = { .name = "samsung_s6d16d0", .id = SECONDARY_DISPLAY_ID, + .port = &samsung_s6d16d0_port1, .chnl_id = MCDE_CHNL_C1, .fifo = MCDE_FIFO_C1, .orientation = MCDE_DISPLAY_ROT_90_CCW, .default_pixel_format = MCDE_OVLYPIXFMT_RGB565, - .synchronized_update = false, .dev = { .platform_data = &samsung_s6d16d0_pdata1, }, @@ -478,7 +478,7 @@ static int __init init_display_devices(void) /* Not all STUIBs supports VSYNC, disable vsync for STUIB */ if (uib_is_stuib()) { /* Samsung display on STUIB */ - samsung_s6d16d0_display0.synchronized_update = false; + samsung_s6d16d0_display0.port->sync_src = MCDE_SYNCSRC_OFF; samsung_s6d16d0_display0.orientation = MCDE_DISPLAY_ROT_90_CCW; (void)mcde_display_device_register(&samsung_s6d16d0_display0); } else if (uib_is_u8500uib()) { diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index b002b6f6688..53345ecf13f 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -68,6 +68,7 @@ static struct mcde_col_transform rgb_2_yCbCr_transform = { static struct mcde_port sony_port0 = { .link = 0, + .sync_src = MCDE_SYNCSRC_BTA, }; static struct mcde_display_sony_acx424akp_platform_data \ @@ -82,11 +83,6 @@ static struct mcde_display_device sony_acx424akp_display0 = { .chnl_id = MCDE_CHNL_A, .fifo = MCDE_FIFO_A, .default_pixel_format = MCDE_OVLYPIXFMT_RGBA8888, -#ifdef CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC - .synchronized_update = true, -#else - .synchronized_update = false, -#endif .dev = { .platform_data = &sony_acx424akp_display0_pdata, }, |