[PATCH -v3 02/11] drm/exynos: atomic phase 1: use drm_plane_helper_disable()

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.pado...@collabora.co.uk>

The atomic helper to disable planes also uses the optional
.atomic_disable() helper. The unique operation it does is calling
.win_disable()

exynos_drm_fb_get_buf_cnt() needs a fb check too to avoid a null pointer.

Signed-off-by: Gustavo Padovan <gustavo.pado...@collabora.co.uk>
---
 drivers/gpu/drm/exynos/exynos_drm_fb.c    |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_plane.c | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c 
b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index d346d1e..470456d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -136,7 +136,7 @@ unsigned int exynos_drm_fb_get_buf_cnt(struct 
drm_framebuffer *fb)
 
        exynos_fb = to_exynos_fb(fb);
 
-       return exynos_fb->buf_cnt;
+       return exynos_fb ? exynos_fb->buf_cnt : 0;
 }
 
 struct drm_framebuffer *
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c 
b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 5a37816..2152a24 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -158,21 +158,9 @@ exynos_update_plane(struct drm_plane *plane, struct 
drm_crtc *crtc,
                exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos);
 }
 
-static int exynos_disable_plane(struct drm_plane *plane)
-{
-       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;
-}
-
 static struct drm_plane_funcs exynos_plane_funcs = {
        .update_plane   = drm_plane_helper_update,
-       .disable_plane  = exynos_disable_plane,
+       .disable_plane  = drm_plane_helper_disable,
        .destroy        = drm_plane_cleanup,
 };
 
@@ -194,9 +182,21 @@ static void exynos_plane_atomic_update(struct drm_plane 
*plane,
                            state->src_w >> 16, state->src_h >> 16);
 }
 
+static void exynos_plane_atomic_disable(struct drm_plane *plane,
+                                       struct drm_plane_state *old_state)
+{
+       struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
+       struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(old_state->crtc);
+
+       if (exynos_crtc->ops->win_disable)
+               exynos_crtc->ops->win_disable(exynos_crtc,
+                                             exynos_plane->zpos);
+}
+
 static const struct drm_plane_helper_funcs plane_helper_funcs = {
        .atomic_check = exynos_plane_atomic_check,
        .atomic_update = exynos_plane_atomic_update,
+       .atomic_disable = exynos_plane_atomic_disable,
 };
 
 static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html