drm/crtc_helper: Replace open-coded CRTC state helpers

Rather than open-coding our own CRTC state helpers, use the atomic helpers
added in f5e7840b0c, and make our freeing behaviour consistent as well.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Tested-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index f2f42b17967a7dff88a2914d8fff9df2e230797d..9297a61a7c95ba390a259b0eb3b735bc0911dc59 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -927,14 +927,15 @@ int drm_helper_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mod
 
        if (crtc->funcs->atomic_duplicate_state)
                crtc_state = crtc->funcs->atomic_duplicate_state(crtc);
-       else if (crtc->state)
-               crtc_state = kmemdup(crtc->state, sizeof(*crtc_state),
-                                    GFP_KERNEL);
-       else
+       else {
                crtc_state = kzalloc(sizeof(*crtc_state), GFP_KERNEL);
-       if (!crtc_state)
-               return -ENOMEM;
-       crtc_state->crtc = crtc;
+               if (!crtc_state)
+                       return -ENOMEM;
+               if (crtc->state)
+                       __drm_atomic_helper_crtc_duplicate_state(crtc, crtc_state);
+               else
+                       crtc_state->crtc = crtc;
+       }
 
        crtc_state->enable = true;
        crtc_state->planes_changed = true;
@@ -944,30 +945,25 @@ int drm_helper_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mod
 
        if (crtc_funcs->atomic_check) {
                ret = crtc_funcs->atomic_check(crtc, crtc_state);
-               if (ret) {
-                       if (crtc->funcs->atomic_destroy_state) {
-                               crtc->funcs->atomic_destroy_state(crtc,
-                                                                 crtc_state);
-                       } else {
-                               kfree(crtc_state);
-                       }
-
-                       return ret;
-               }
+               if (ret)
+                       goto out;
        }
 
        swap(crtc->state, crtc_state);
 
        crtc_funcs->mode_set_nofb(crtc);
 
-       if (crtc_state) {
-               if (crtc->funcs->atomic_destroy_state)
-                       crtc->funcs->atomic_destroy_state(crtc, crtc_state);
-               else
-                       kfree(crtc_state);
+       ret = drm_helper_crtc_mode_set_base(crtc, x, y, old_fb);
+
+out:
+       if (crtc->funcs->atomic_destroy_state)
+               crtc->funcs->atomic_destroy_state(crtc, crtc_state);
+       else {
+               __drm_atomic_helper_crtc_destroy_state(crtc, crtc_state);
+               kfree(crtc_state);
        }
 
-       return drm_helper_crtc_mode_set_base(crtc, x, y, old_fb);
+       return ret;
 }
 EXPORT_SYMBOL(drm_helper_crtc_mode_set);