drm/exynos: remove exynos_plane_dpms

The exynos_plane_dpms function handles enabled flag of exynos plane and
calls internal hw driver callback function for hw overlay on/off. But
it causes state disharmory problem currently and is will be obstacle to
apply atomic operation later to keep non-standard per-plane dpms state
like enabled flag.

Let's remove enabled flag, it just stop to recall internal callback
function but hw drivers can handle it properly. And call internal
callback function directly then we can remove unnecessary
exynos_plane_dpms function

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 358cff67e5cef86bf5415f5fd45b11a1f6a99bd0..2dfb847d0ce01552154da66b0402c9a49e4a31e9 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -145,32 +145,6 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
                exynos_crtc->ops->win_mode_set(exynos_crtc, exynos_plane);
 }
 
-void exynos_plane_dpms(struct drm_plane *plane, int mode)
-{
-       struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
-       struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(plane->crtc);
-
-       if (mode == DRM_MODE_DPMS_ON) {
-               if (exynos_plane->enabled)
-                       return;
-
-               if (exynos_crtc->ops->win_enable)
-                       exynos_crtc->ops->win_enable(exynos_crtc,
-                                                    exynos_plane->zpos);
-
-               exynos_plane->enabled = true;
-       } else {
-               if (!exynos_plane->enabled)
-                       return;
-
-               if (exynos_crtc->ops->win_disable)
-                       exynos_crtc->ops->win_disable(exynos_crtc,
-                                                     exynos_plane->zpos);
-
-               exynos_plane->enabled = false;
-       }
-}
-
 int
 exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
                     struct drm_framebuffer *fb, int crtc_x, int crtc_y,
@@ -199,7 +173,12 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
 
 static int exynos_disable_plane(struct drm_plane *plane)
 {
-       exynos_plane_dpms(plane, DRM_MODE_DPMS_OFF);
+       struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
+       struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(plane->crtc);
+
+       if (exynos_crtc->ops->win_disable)
+               exynos_crtc->ops->win_disable(exynos_crtc,
+                                             exynos_plane->zpos);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h
index 59d40755095b3de5bf23d66bcddb85b31acbace0..9d3c374e7b3ec44ea3fe36c078e2819543bf3c6a 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.h
@@ -20,7 +20,6 @@ int exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
                        unsigned int crtc_w, unsigned int crtc_h,
                        uint32_t src_x, uint32_t src_y,
                        uint32_t src_w, uint32_t src_h);
-void exynos_plane_dpms(struct drm_plane *plane, int mode);
 struct drm_plane *exynos_plane_init(struct drm_device *dev,
                                    unsigned long possible_crtcs,
                                    enum drm_plane_type type);