OMAPDSS: OMAPFB: Fix fb initialization

Correcting the patch porting mistake.
Change-Id: Iae23c48aa5ccc34f4855cd0f90aa09685117fe67

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
--
[resolve rebase conflict]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

diff --git a/arch/arm/configs/android_dra7_defconfig b/arch/arm/configs/android_dra7_defconfig
index e90fa5ca7ce7b671b94c66e33f8a1bd3690889e2..e6597da3accc52aa9d1da0dec19e65940d67f596 100755 (executable)
--- a/arch/arm/configs/android_dra7_defconfig
+++ b/arch/arm/configs/android_dra7_defconfig
@@ -33,7 +33,7 @@ CONFIG_SMP=y
 CONFIG_NR_CPUS=2
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO0,115200 init=/init androidboot.console=ttyO0"
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO0,115200 init=/init androidboot.console=ttyO0 vmalloc=496M omapfb.fb_opt=-1,-1,-1,1,1280,720"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
 CONFIG_CPU_FREQ=y
@@ -213,8 +213,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y

diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
old mode 100644 (file)
new mode 100755 (executable)
index 90dc201..a6b7e4c
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2709,6 +2709,12 @@ static int __init omapfb_probe(struct platform_device *pdev)
                r = -EINVAL;
                goto cleanup;
        }
+       fbdev->num_overlays = omap_dss_get_num_overlays();
+       for (i = 0; i < fbdev->num_overlays; i++)
+               fbdev->overlays[i] = omap_dss_get_overlay(i);
+       fbdev->num_managers = omap_dss_get_num_overlay_managers();
+       for (i = 0; i < fbdev->num_managers; i++)
+               fbdev->managers[i] = omap_dss_get_overlay_manager(i);
 
        def_display = NULL;
 
@@ -2739,10 +2745,6 @@ static int __init omapfb_probe(struct platform_device *pdev)
                goto cleanup;
        }
 
-       fbdev->num_managers = omap_dss_get_num_overlay_managers();
-       for (i = 0; i < fbdev->num_managers; i++)
-               fbdev->managers[i] = omap_dss_get_overlay_manager(i);
-
        if (def_mode && strlen(def_mode) > 0) {
                if (omapfb_parse_def_modes(fbdev))
                        dev_warn(&pdev->dev, "cannot parse default modes\n");