Convert rcar-du to using __drm_atomic_helper_crtc_reset(), instead of
writing its own version. Instead of open coding destroy_state(), call
it directly for freeing the old state.

Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Kieran Bingham <kieran.bingham+rene...@ideasonboard.com>
Cc: linux-renesas-...@vger.kernel.org
---
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c 
b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 4cdea14d552f..7766551e67fc 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -891,22 +891,17 @@ static void rcar_du_crtc_cleanup(struct drm_crtc *crtc)
 
 static void rcar_du_crtc_reset(struct drm_crtc *crtc)
 {
-       struct rcar_du_crtc_state *state;
+       struct rcar_du_crtc_state *state = kzalloc(sizeof(*state), GFP_KERNEL);
 
-       if (crtc->state) {
+       if (crtc->state)
                rcar_du_crtc_atomic_destroy_state(crtc, crtc->state);
-               crtc->state = NULL;
-       }
 
-       state = kzalloc(sizeof(*state), GFP_KERNEL);
+       __drm_atomic_helper_crtc_reset(crtc, &state->state);
        if (state == NULL)
                return;
 
        state->crc.source = VSP1_DU_CRC_NONE;
        state->crc.index = 0;
-
-       crtc->state = &state->state;
-       crtc->state->crtc = crtc;
 }
 
 static int rcar_du_crtc_enable_vblank(struct drm_crtc *crtc)
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to