summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-u5500-mcde.c
diff options
context:
space:
mode:
authorMarcel Tunnissen <Marcel.Tuennissen@stericsson.com>2011-06-01 14:14:16 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:35 +0200
commitec34d684f263c4585670ab9cc86866d1bbb0b17f (patch)
tree89b7b48808717f0afb98f4f03cb6fb3ee0bd66ff /arch/arm/mach-ux500/board-u5500-mcde.c
parentf9a15f2a58e70fe536a58ef4e2bd33ac0f07ffab (diff)
video: mcde: fix build problems with update
This patch fixes build problems that were introduced by the patch with ID Ice1f936a8a00e2fbc8fdf7e8c6621c539efe0ac4. The problems are seen when non-default configurations are used. ST-Ericsson ID: 343242 ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iac284116e8f33f059bb85cf9e10820fb51f8f6f2 Signed-off-by: Marcel Tunnissen <Marcel.Tuennissen@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24347 Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Tested-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/board-u5500-mcde.c')
-rw-r--r--arch/arm/mach-ux500/board-u5500-mcde.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c
index 49b6c53d98e..34c29398c72 100644
--- a/arch/arm/mach-ux500/board-u5500-mcde.c
+++ b/arch/arm/mach-ux500/board-u5500-mcde.c
@@ -318,6 +318,7 @@ static int framebuffer_postregistered_callback(struct notifier_block *nb,
struct mcde_overlay *ovly = mfb->ovlys[i];
struct mcde_overlay_info ovly_info;
struct mcde_fb *mfb = to_mcde_fb(info);
+ int num_buffers;
memset(&ovly_info, 0, sizeof(ovly_info));
ovly_info.paddr = fix.smem_start +
fix.line_length * var.yoffset;
@@ -331,7 +332,8 @@ static int framebuffer_postregistered_callback(struct notifier_block *nb,
ovly_info.dirty.w = var.xres;
ovly_info.dirty.h = var.yres;
(void) mcde_dss_apply_overlay(ovly, &ovly_info);
- ret = mcde_dss_update_overlay(ovly);
+ num_buffers = var.yres_virtual / var.yres;
+ ret = mcde_dss_update_overlay(ovly, num_buffers == 3);
if (ret)
break;
}