From 5c472c716e7aeb8e9a0029906f579115f587b61f Mon Sep 17 00:00:00 2001
From: Inki Dae <inki.dae@samsung.com>
Date: Thu, 25 Apr 2013 19:21:42 +0900
Subject: [PATCH] --- yaml --- r: 371612 b: refs/heads/master c:
 baa88c8313bfdb5086220cbd962a93617ee85a91 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c | 14 ++------------
 trunk/drivers/gpu/drm/mgag200/mgag200_fb.c     |  3 +++
 trunk/drivers/gpu/drm/mgag200/mgag200_main.c   |  2 ++
 trunk/drivers/gpu/drm/mgag200/mgag200_mode.c   |  7 ++++---
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 074161da2d56..b23f5166e7f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8bf6b0d5aa403e9ca69ded9ddda3babd0a64d31
+refs/heads/master: baa88c8313bfdb5086220cbd962a93617ee85a91
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 15e58f5abe02..4073430e22c3 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -949,16 +949,6 @@ static int fimd_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = clk_prepare(ctx->bus_clk);
-	if (ret < 0)
-		return ret;
-
-	ret = clk_prepare(ctx->lcd_clk);
-	if  (ret < 0) {
-		clk_unprepare(ctx->bus_clk);
-		return ret;
-	}
-
 	ctx->vidcon0 = pdata->vidcon0;
 	ctx->vidcon1 = pdata->vidcon1;
 	ctx->default_win = pdata->default_win;
@@ -1006,8 +996,8 @@ static int fimd_remove(struct platform_device *pdev)
 	if (ctx->suspended)
 		goto out;
 
-	clk_unprepare(ctx->lcd_clk);
-	clk_unprepare(ctx->bus_clk);
+	clk_disable(ctx->lcd_clk);
+	clk_disable(ctx->bus_clk);
 
 	pm_runtime_set_suspended(dev);
 	pm_runtime_put_sync(dev);
diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_fb.c b/trunk/drivers/gpu/drm/mgag200/mgag200_fb.c
index 421beabec45b..2ebe0f635b26 100644
--- a/trunk/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/trunk/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -105,9 +105,12 @@ static int mgag200fb_create_object(struct mga_fbdev *afbdev,
 				   struct drm_gem_object **gobj_p)
 {
 	struct drm_device *dev = afbdev->helper.dev;
+	u32 bpp, depth;
 	u32 size;
 	struct drm_gem_object *gobj;
+
 	int ret = 0;
+	drm_fb_get_bpp_depth(mode_cmd->pixel_format, &depth, &bpp);
 
 	size = mode_cmd->pitches[0] * mode_cmd->height;
 	ret = mgag200_gem_create(dev, size, true, &gobj);
diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_main.c b/trunk/drivers/gpu/drm/mgag200/mgag200_main.c
index 99059237da38..1f7ea057b2fc 100644
--- a/trunk/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/trunk/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -217,6 +217,8 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags)
 
 	drm_mode_config_init(dev);
 	dev->mode_config.funcs = (void *)&mga_mode_funcs;
+	dev->mode_config.min_width = 0;
+	dev->mode_config.min_height = 0;
 	dev->mode_config.preferred_depth = 24;
 	dev->mode_config.prefer_shadow = 1;
 
diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_mode.c b/trunk/drivers/gpu/drm/mgag200/mgag200_mode.c
index 7337013a4a0e..fe22bb780e1d 100644
--- a/trunk/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/trunk/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1261,8 +1261,9 @@ static const struct drm_crtc_helper_funcs mga_helper_funcs = {
 };
 
 /* CRTC setup */
-static void mga_crtc_init(struct mga_device *mdev)
+static void mga_crtc_init(struct drm_device *dev)
 {
+	struct mga_device *mdev = dev->dev_private;
 	struct mga_crtc *mga_crtc;
 	int i;
 
@@ -1273,7 +1274,7 @@ static void mga_crtc_init(struct mga_device *mdev)
 	if (mga_crtc == NULL)
 		return;
 
-	drm_crtc_init(mdev->dev, &mga_crtc->base, &mga_crtc_funcs);
+	drm_crtc_init(dev, &mga_crtc->base, &mga_crtc_funcs);
 
 	drm_mode_crtc_set_gamma_size(&mga_crtc->base, MGAG200_LUT_SIZE);
 	mdev->mode_info.crtc = mga_crtc;
@@ -1528,7 +1529,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
 
 	mdev->dev->mode_config.fb_base = mdev->mc.vram_base;
 
-	mga_crtc_init(mdev);
+	mga_crtc_init(mdev->dev);
 
 	encoder = mga_encoder_init(mdev->dev);
 	if (!encoder) {