20 files changed, 245 insertions, 265 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 260d9c1785d0..1b6e83550c76 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2350,6 +2350,9 @@ F:	include/drm/i915*
 
 DRM DRIVERS FOR EXYNOS
 M:      Inki Dae <inki.dae@samsung.com>
+M:      Joonyoung Shim <jy0922.shim@samsung.com>
+M:      Seung-Woo Kim <sw0312.kim@samsung.com>
+M:      Kyungmin Park <kyungmin.park@samsung.com>
 L:      dri-devel@lists.freedesktop.org
 S:      Supported
 F:      drivers/gpu/drm/exynos
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 4b71647782d0..317c28ce8328 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -194,10 +194,10 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
 
 err_out:
         if (bridge->driver->needs_scratch_page) {
-                void *va = page_address(bridge->scratch_page_page);
+                struct page *page = bridge->scratch_page_page;
 
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE);
         }
         if (got_gatt)
                 bridge->driver->free_gatt_table(bridge);
@@ -221,10 +221,10 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 
         if (bridge->driver->agp_destroy_page &&
             bridge->driver->needs_scratch_page) {
-                void *va = page_address(bridge->scratch_page_page);
+                struct page *page = bridge->scratch_page_page;
 
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP);
-                bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP);
+                bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE);
         }
 }
 
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index f9aaa56eae07..b9e5266c341b 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -13,7 +13,7 @@ config DRM_EXYNOS
 
 config DRM_EXYNOS_FIMD
         tristate "Exynos DRM FIMD"
-        depends on DRM_EXYNOS
+        depends on DRM_EXYNOS && !FB_S3C
         default n
         help
           Choose this option if you want to use Exynos FIMD for DRM.
@@ -21,7 +21,7 @@ config DRM_EXYNOS_FIMD
 
 config DRM_EXYNOS_HDMI
         tristate "Exynos DRM HDMI"
-        depends on DRM_EXYNOS
+        depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV
         help
           Choose this option if you want to use Exynos HDMI for DRM.
           If M is selected, the module will be called exynos_drm_hdmi
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index ca83139cd309..b6a737d196ae 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -158,7 +158,8 @@ static void fimd_dpms(struct device *subdrv_dev, int mode)
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                pm_runtime_put_sync(subdrv_dev);
+                if (!ctx->suspended)
+                        pm_runtime_put_sync(subdrv_dev);
                 break;
         default:
                 DRM_DEBUG_KMS("unspecified mode %d\n", mode);
@@ -734,6 +735,46 @@ static void fimd_clear_win(struct fimd_context *ctx, int win)
         writel(val, ctx->regs + SHADOWCON);
 }
 
+static int fimd_power_on(struct fimd_context *ctx, bool enable)
+{
+        struct exynos_drm_subdrv *subdrv = &ctx->subdrv;
+        struct device *dev = subdrv->manager.dev;
+
+        DRM_DEBUG_KMS("%s\n", __FILE__);
+
+        if (enable != false && enable != true)
+                return -EINVAL;
+
+        if (enable) {
+                int ret;
+
+                ret = clk_enable(ctx->bus_clk);
+                if (ret < 0)
+                        return ret;
+
+                ret = clk_enable(ctx->lcd_clk);
+                if  (ret < 0) {
+                        clk_disable(ctx->bus_clk);
+                        return ret;
+                }
+
+                ctx->suspended = false;
+
+                /* if vblank was enabled status, enable it again. */
+                if (test_and_clear_bit(0, &ctx->irq_flags))
+                        fimd_enable_vblank(dev);
+
+                fimd_apply(dev);
+        } else {
+                clk_disable(ctx->lcd_clk);
+                clk_disable(ctx->bus_clk);
+
+                ctx->suspended = true;
+        }
+
+        return 0;
+}
+
 static int __devinit fimd_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
@@ -911,39 +952,30 @@ out:
 #ifdef CONFIG_PM_SLEEP
 static int fimd_suspend(struct device *dev)
 {
-        int ret;
+        struct fimd_context *ctx = get_fimd_context(dev);
 
         if (pm_runtime_suspended(dev))
                 return 0;
 
-        ret = pm_runtime_suspend(dev);
-        if (ret < 0)
-                return ret;
-
-        return 0;
+        /*
+         * do not use pm_runtime_suspend(). if pm_runtime_suspend() is
+         * called here, an error would be returned by that interface
+         * because the usage_count of pm runtime is more than 1.
+         */
+        return fimd_power_on(ctx, false);
 }