1 files changed, 70 insertions, 19 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index ee43cc22085..e3861ac4929 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -34,7 +34,6 @@
 #include "exynos_drm_fb.h"
 #include "exynos_drm_encoder.h"
 #include "exynos_drm_gem.h"
-#include "exynos_drm_buf.h"
 
 #define to_exynos_crtc(x)       container_of(x, struct exynos_drm_crtc,\
                                 drm_crtc)
@@ -52,11 +51,13 @@
  *      drm framework doesn't support multiple irq yet.
  *      we can refer to the crtc to current hardware interrupt occured through
  *      this pipe value.
+ * @dpms: store the crtc dpms value
  */
 struct exynos_drm_crtc {
         struct drm_crtc                 drm_crtc;
         struct exynos_drm_overlay       overlay;
         unsigned int                    pipe;
+        unsigned int                    dpms;
 };
 
 static void exynos_drm_crtc_apply(struct drm_crtc *crtc)
@@ -78,19 +79,23 @@ int exynos_drm_overlay_update(struct exynos_drm_overlay *overlay,
         struct exynos_drm_gem_buf *buffer;
         unsigned int actual_w;
         unsigned int actual_h;
+        int nr = exynos_drm_format_num_buffers(fb->pixel_format);
+        int i;
+
+        for (i = 0; i < nr; i++) {
+                buffer = exynos_drm_fb_buffer(fb, i);
+                if (!buffer) {
+                        DRM_LOG_KMS("buffer is null\n");
+                        return -EFAULT;
+                }
 
-        buffer = exynos_drm_fb_get_buf(fb);
-        if (!buffer) {
-                DRM_LOG_KMS("buffer is null.\n");
-                return -EFAULT;
-        }
-
-        overlay->dma_addr = buffer->dma_addr;
-        overlay->vaddr = buffer->kvaddr;
+                overlay->dma_addr[i] = buffer->dma_addr;
+                overlay->vaddr[i] = buffer->kvaddr;
 
-        DRM_DEBUG_KMS("vaddr = 0x%lx, dma_addr = 0x%lx\n",
-                        (unsigned long)overlay->vaddr,
-                        (unsigned long)overlay->dma_addr);
+                DRM_DEBUG_KMS("buffer: %d, vaddr = 0x%lx, dma_addr = 0x%lx\n",
+                                i, (unsigned long)overlay->vaddr[i],
+                                (unsigned long)overlay->dma_addr[i]);
+        }
 
         actual_w = min((mode->hdisplay - pos->crtc_x), pos->crtc_w);
         actual_h = min((mode->vdisplay - pos->crtc_y), pos->crtc_h);
@@ -101,7 +106,8 @@ int exynos_drm_overlay_update(struct exynos_drm_overlay *overlay,
         overlay->fb_width = fb->width;
         overlay->fb_height = fb->height;
         overlay->bpp = fb->bits_per_pixel;
-        overlay->pitch = fb->pitch;
+        overlay->pitch = fb->pitches[0];
+        overlay->pixel_format = fb->pixel_format;
 
         /* set overlay range to be displayed. */
         overlay->crtc_x = pos->crtc_x;
@@ -153,26 +159,37 @@ static int exynos_drm_crtc_update(struct drm_crtc *crtc)
 
 static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
+        struct drm_device *dev = crtc->dev;
         struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
 
         DRM_DEBUG_KMS("crtc[%d] mode[%d]\n", crtc->base.id, mode);
 
+        if (exynos_crtc->dpms == mode) {
+                DRM_DEBUG_KMS("desired dpms mode is same as previous one.\n");
+                return;
+        }
+
+        mutex_lock(&dev->struct_mutex);
+
         switch (mode) {
         case DRM_MODE_DPMS_ON:
-                exynos_drm_fn_encoder(crtc, &exynos_crtc->pipe,
-                                exynos_drm_encoder_crtc_commit);
+                exynos_drm_fn_encoder(crtc, &mode,
+                                exynos_drm_encoder_crtc_dpms);
+                exynos_crtc->dpms = mode;
                 break;
         case DRM_MODE_DPMS_STANDBY:
         case DRM_MODE_DPMS_SUSPEND:
         case DRM_MODE_DPMS_OFF:
-                /* TODO */
-                exynos_drm_fn_encoder(crtc, NULL,
-                                exynos_drm_encoder_crtc_disable);
+                exynos_drm_fn_encoder(crtc, &mode,
+                                exynos_drm_encoder_crtc_dpms);
+                exynos_crtc->dpms = mode;
                 break;
         default:
-                DRM_DEBUG_KMS("unspecified mode %d\n", mode);
+                DRM_ERROR("unspecified mode %d\n", mode);
                 break;
         }
+
+        mutex_unlock(&dev->struct_mutex);
 }
 
 static void exynos_drm_crtc_prepare(struct drm_crtc *crtc)
@@ -188,6 +205,28 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
+        /*
+         * when set_crtc is requested from user or at booting time,
+         * crtc->commit would be called without dpms call so if dpms is
+         * no power on then crtc->dpms should be called
+         * with DRM_MODE_DPMS_ON for the hardware power to be on.
+         */
+        if (exynos_crtc->dpms != DRM_MODE_DPMS_ON) {
+                int mode = DRM_MODE_DPMS_ON;
+
+                /*
+                 * enable hardware(power on) to all encoders hdmi connected
+                 * to current crtc.
+                 */
+                exynos_drm_crtc_dpms(crtc, mode);
+                /*
+                 * enable dma to all encoders connected to current crtc and
+                 * lcd panel.
+                 */
+                exynos_drm_fn_encoder(crtc, &mode,
+                                        exynos_drm_encoder_dpms_from_crtc);
+        }
+
         exynos_drm_fn_encoder(crtc, &exynos_crtc->pipe,
                         exynos_drm_encoder_crtc_commit);
 }
@@ -344,6 +383,8 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)
         }
 
         exynos_crtc->pipe = nr;
+        exynos_crtc->dpms = DRM_MODE_DPMS_OFF;
+        exynos_crtc->overlay.zpos = DEFAULT_ZPOS;
         crtc = &exynos_crtc->drm_crtc;
 
         private->crtc[nr] = crtc;
@@ -357,9 +398,14 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)
 int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc)
 {
         struct exynos_drm_private *private = dev->dev_private;
+        struct exynos_drm_crtc *exynos_crtc =
+                to_exynos_crtc(private->crtc[crtc]);
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
+        if (exynos_crtc->dpms != DRM_MODE_DPMS_ON)
+                return -EPERM;
+
         exynos_drm_fn_encoder(private->crtc[crtc], &crtc,
                         exynos_drm_enable_vblank);
 
@@ -369,9 +415,14 @@ int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc)
 void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int crtc)
 {
         struct exynos_drm_private *private = dev->dev_private;
+        struct exynos_drm_crtc *exynos_crtc =
+                to_exynos_crtc(private->crtc[crtc]);
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
+        if (exynos_crtc->dpms != DRM_MODE_DPMS_ON)
+                return;
+
         exynos_drm_fn_encoder(private->crtc[crtc], &crtc,
                         exynos_drm_disable_vblank);
 }