summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-04-29 19:45:57 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-04-29 19:45:57 +0000
commit3499b1d829649880be07248d6339d060266bbe96 (patch)
treef1329573ea1cb7e03bbe4ab756e3a35ac9a3ee6d /drivers/video
parent53027cdf2a676e19306011cb01cd9c7c00124cd6 (diff)
parentaac63a4ac861476858d24a5a8b09098b1ef9c54d (diff)
Merge branch 'fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/exynos/exynos_mipi_dsi_common.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/exynos/exynos_mipi_dsi_common.c b/drivers/video/exynos/exynos_mipi_dsi_common.c
index 14909c1d3832..99f645183759 100644
--- a/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -738,11 +738,11 @@ int exynos_mipi_dsi_set_display_mode(struct mipi_dsim_device *dsim,
if (dsim_config->auto_vertical_cnt == 0) {
exynos_mipi_dsi_set_main_disp_vporch(dsim,
dsim_config->cmd_allow,
- timing->upper_margin,
- timing->lower_margin);
+ timing->lower_margin,
+ timing->upper_margin);
exynos_mipi_dsi_set_main_disp_hporch(dsim,
- timing->left_margin,
- timing->right_margin);
+ timing->right_margin,
+ timing->left_margin);
exynos_mipi_dsi_set_main_disp_sync_area(dsim,
timing->vsync_len,
timing->hsync_len);