7 files changed, 21 insertions, 51 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c
index 618bd4d87d28..99d5527b2ca6 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_connector.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c
@@ -54,14 +54,14 @@ convert_to_display_mode(struct drm_display_mode *mode,
         mode->vrefresh = timing->refresh;
 
         mode->hdisplay = timing->xres;
-        mode->hsync_start = mode->hdisplay + timing->left_margin;
+        mode->hsync_start = mode->hdisplay + timing->right_margin;
         mode->hsync_end = mode->hsync_start + timing->hsync_len;
-        mode->htotal = mode->hsync_end + timing->right_margin;
+        mode->htotal = mode->hsync_end + timing->left_margin;
 
         mode->vdisplay = timing->yres;
-        mode->vsync_start = mode->vdisplay + timing->upper_margin;
+        mode->vsync_start = mode->vdisplay + timing->lower_margin;
         mode->vsync_end = mode->vsync_start + timing->vsync_len;
-        mode->vtotal = mode->vsync_end + timing->lower_margin;
+        mode->vtotal = mode->vsync_end + timing->upper_margin;
         mode->width_mm = panel->width_mm;
         mode->height_mm = panel->height_mm;
 
@@ -85,14 +85,14 @@ convert_to_video_timing(struct fb_videomode *timing,
         timing->refresh = drm_mode_vrefresh(mode);
 
         timing->xres = mode->hdisplay;
-        timing->left_margin = mode->hsync_start - mode->hdisplay;
+        timing->right_margin = mode->hsync_start - mode->hdisplay;
         timing->hsync_len = mode->hsync_end - mode->hsync_start;
-        timing->right_margin = mode->htotal - mode->hsync_end;
+        timing->left_margin = mode->htotal - mode->hsync_end;
 
         timing->yres = mode->vdisplay;
-        timing->upper_margin = mode->vsync_start - mode->vdisplay;
+        timing->lower_margin = mode->vsync_start - mode->vdisplay;
         timing->vsync_len = mode->vsync_end - mode->vsync_start;
-        timing->lower_margin = mode->vtotal - mode->vsync_end;
+        timing->upper_margin = mode->vtotal - mode->vsync_end;
 
         if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                 timing->vmode = FB_VMODE_INTERLACED;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 58820ebd3558..09cc13f791b3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -246,7 +246,7 @@ static struct platform_driver exynos_drm_platform_driver = {
         .remove         = __devexit_p(exynos_drm_platform_remove),
         .driver         = {
                 .owner  = THIS_MODULE,
-                .name   = DRIVER_NAME,
+                .name   = "exynos-drm",
         },
 };
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 3508700e529b..54f8f074822f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -46,39 +46,13 @@ struct exynos_drm_fbdev {
         struct exynos_drm_gem_obj       *exynos_gem_obj;
 };
 
-static int exynos_drm_fbdev_set_par(struct fb_info *info)
-{
-        struct fb_var_screeninfo *var = &info->var;
-
-        switch (var->bits_per_pixel) {
-        case 32:
-        case 24:
-        case 18:
-        case 16:
-        case 12:
-                info->fix.visual = FB_VISUAL_TRUECOLOR;
-                break;
-        case 1:
-                info->fix.visual = FB_VISUAL_MONO01;
-                break;
-        default:
-                info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-                break;
-        }
-
-        info->fix.line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
-
-        return drm_fb_helper_set_par(info);
-}
-
-
 static struct fb_ops exynos_drm_fb_ops = {
         .owner          = THIS_MODULE,
         .fb_fillrect    = cfb_fillrect,
         .fb_copyarea    = cfb_copyarea,
         .fb_imageblit   = cfb_imageblit,
         .fb_check_var   = drm_fb_helper_check_var,
-        .fb_set_par     = exynos_drm_fbdev_set_par,
+        .fb_set_par     = drm_fb_helper_set_par,
         .fb_blank       = drm_fb_helper_blank,
         .fb_pan_display = drm_fb_helper_pan_display,
         .fb_setcmap     = drm_fb_helper_setcmap,
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 360adf2bba04..56458eea0501 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -817,8 +817,6 @@ static int __devinit fimd_probe(struct platform_device *pdev)
                 goto err_clk_get;
         }
 
-        clk_enable(ctx->bus_clk);
-
         ctx->lcd_clk = clk_get(dev, "sclk_fimd");
         if (IS_ERR(ctx->lcd_clk)) {
                 dev_err(dev, "failed to get lcd clock\n");
@@ -826,8 +824,6 @@ static int __devinit fimd_probe(struct platform_device *pdev)
                 goto err_bus_clk;
         }
 
-        clk_enable(ctx->lcd_clk);
-
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 dev_err(dev, "failed to find registers\n");
@@ -864,17 +860,11 @@ static int __devinit fimd_probe(struct platform_device *pdev)
                 goto err_req_irq;
         }
 
-        ctx->clkdiv = fimd_calc_clkdiv(ctx, &panel->timing);
         ctx->vidcon0 = pdata->vidcon0;
         ctx->vidcon1 = pdata->vidcon1;
         ctx->default_win = pdata->default_win;
         ctx->panel = panel;
 
-        panel->timing.pixclock = clk_get_rate(ctx->lcd_clk) / ctx->clkdiv;
-
-        DRM_DEBUG_KMS("pixel clock = %d, clkdiv = %d\n",
-                        panel->timing.pixclock, ctx->clkdiv);
-
         subdrv = &ctx->subdrv;
 
         subdrv->probe = fimd_subdrv_probe;
@@ -889,10 +879,15 @@ static int __devinit fimd_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ctx);
 
-        pm_runtime_set_active(dev);
         pm_runtime_enable(dev);
         pm_runtime_get_sync(dev);
 
+        ctx->clkdiv = fimd_calc_clkdiv(ctx, &panel->timing);
+        panel->timing.pixclock = clk_get_rate(ctx->lcd_clk) / ctx->clkdiv;
+
+        DRM_DEBUG_KMS("pixel clock = %d, clkdiv = %d\n",
+                        panel->timing.pixclock, ctx->clkdiv);
+
         for (win = 0; win < WINDOWS_NR; win++)
                 fimd_clear_win(ctx, win);
 
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 03c53fcf8653..558ac716a328 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2689,7 +2689,7 @@
 #define   DVS_FORMAT_RGBX888    (2<<25)
 #define   DVS_FORMAT_RGBX161616 (3<<25)
 #define   DVS_SOURCE_KEY        (1<<22)
-#define   DVS_RGB_ORDER_RGBX    (1<<20)
+#define   DVS_RGB_ORDER_XBGR    (1<<20)
 #define   DVS_YUV_BYTE_ORDER_MASK (3<<16)
 #define   DVS_YUV_ORDER_YUYV    (0<<16)
 #define   DVS_YUV_ORDER_UYVY    (1<<16)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f851db7be2cc..397087cf689e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7828,6 +7828,7 @@ int intel_framebuffer_init(struct drm_device *dev,
         case DRM_FORMAT_RGB332:
         case DRM_FORMAT_RGB565:
         case DRM_FORMAT_XRGB8888:
+        case DRM_FORMAT_XBGR8888:
         case DRM_FORMAT_ARGB8888:
         case DRM_FORMAT_XRGB2101010:
         case DRM_FORMAT_ARGB2101010:
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 2288abf88cce..a0835040c86b 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -225,16 +225,16 @@ snb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 
         /* Mask out pixel format bits in case we change it */
         dvscntr &= ~DVS_PIXFORMAT_MASK;
-        dvscntr &= ~DVS_RGB_ORDER_RGBX;
+        dvscntr &= ~DVS_RGB_ORDER_XBGR;
         dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK;
 
         switch (fb->pixel_format) {
         case DRM_FORMAT_XBGR8888:
-                dvscntr |= DVS_FORMAT_RGBX888;
+                dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_XBGR;
                 pixel_size = 4;
                 break;
         case DRM_FORMAT_XRGB8888:
-                dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_RGBX;
+                dvscntr |= DVS_FORMAT_RGBX888;
                 pixel_size = 4;
                 break;
         case DRM_FORMAT_YUYV: