diff options
| author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-25 19:12:44 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:17 +0200 |
| commit | 22bdde68e00014e7a15d56a800848c0a880b9ecb (patch) | |
| tree | fb19e3f3b65250df3492f4c8adc71f3ce0f7452d | |
| parent | 968075598864c6ce9a2a346042a84e5cac4cdf03 (diff) | |
mach: ux500: Make fb create code generic
fbdev create use an hmdi specific function. This patch
remove that function and makes fbcreate generic and shared.
ST-Ericsson ID: 369972
ST-Ericsson FOSS-OUT ID: Trivial
ST-Ericsson Linux next: NA
Change-Id: I8a4b148bb6a01cde74fbe7c4fb30e9d7ee77ef68
Signed-off-by: Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35244
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: Robert MARKLUND <robert.marklund@stericsson.com>
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index ead9dd841c5..f65d1f9e319 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -361,15 +361,10 @@ static int display_postregistered_callback(struct notifier_block *nb, virtual_height = height * 2; - if (ddev->id == AV8100_DISPLAY_ID) { -#ifdef CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER - virtual_height = height * 3; -#endif -#ifdef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE - hdmi_fb_onoff(ddev, 1, 0, 0); -#endif +#ifndef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE + if (ddev->id == AV8100_DISPLAY_ID) goto out; - } +#endif /* Create frame buffer */ fbi = mcde_fb_create(ddev, width, height, width, virtual_height, diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 6f53aaa353f..5c4ba76055d 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -168,15 +168,10 @@ static int display_postregistered_callback(struct notifier_block *nb, virtual_height = height * 2; - if (ddev->id == AV8100_DISPLAY_ID) { -#ifdef CONFIG_DISPLAY_AV8100_TRIPPLE_BUFFER - virtual_height = height * 3; -#endif -#ifdef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE - hdmi_fb_onoff(ddev, 1, 0, 0); -#endif +#ifndef CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE + if (ddev->id == AV8100_DISPLAY_ID) goto out; - } +#endif /* Create frame buffer */ fbi = mcde_fb_create(ddev, width, height, width, virtual_height, |