Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

2 files changed, 19 insertions, 9 deletions

diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 43496d6c377f..65149b22cf37 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -3,7 +3,7 @@ menuconfig FB_OMAP2
         depends on FB && OMAP2_DSS
 
         select OMAP2_VRAM
-        select OMAP2_VRFB
+        select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c
index 04034d410d6d..6a704f176c22 100644
--- a/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/omap2/omapfb/omapfb-main.c
@@ -714,10 +714,10 @@ int check_fb_var(struct fb_info *fbi, struct fb_var_screeninfo *var)
                 var->pixclock = timings.pixel_clock != 0 ?
                         KHZ2PICOS(timings.pixel_clock) :
                         0;
-                var->left_margin = timings.hfp;
-                var->right_margin = timings.hbp;
-                var->upper_margin = timings.vfp;
-                var->lower_margin = timings.vbp;
+                var->left_margin = timings.hbp;
+                var->right_margin = timings.hfp;
+                var->upper_margin = timings.vbp;
+                var->lower_margin = timings.vfp;
                 var->hsync_len = timings.hsw;
                 var->vsync_len = timings.vsw;
         } else {
@@ -2059,10 +2059,10 @@ static int omapfb_mode_to_timings(const char *mode_str,
 
         if (r != 0) {
                 timings->pixel_clock = PICOS2KHZ(var.pixclock);
-                timings->hfp = var.left_margin;
-                timings->hbp = var.right_margin;
-                timings->vfp = var.upper_margin;
-                timings->vbp = var.lower_margin;
+                timings->hbp = var.left_margin;
+                timings->hfp = var.right_margin;
+                timings->vbp = var.upper_margin;
+                timings->vfp = var.lower_margin;
                 timings->hsw = var.hsync_len;
                 timings->vsw = var.vsync_len;
                 timings->x_res = var.xres;
@@ -2198,6 +2198,16 @@ static int omapfb_probe(struct platform_device *pdev)
                 goto err0;
         }
 
+        /* TODO : Replace cpu check with omap_has_vrfb once HAS_FEATURE
+        *        available for OMAP2 and OMAP3
+        */
+        if (def_vrfb && !cpu_is_omap24xx() && !cpu_is_omap34xx()) {
+                def_vrfb = 0;
+                dev_warn(&pdev->dev, "VRFB is not supported on this hardware, "
+                                "ignoring the module parameter vrfb=y\n");
+        }
+
+
         mutex_init(&fbdev->mtx);
 
         fbdev->dev = &pdev->dev;