drm/atomic: Don't open-code CRTC state destroy

One failure path in crtc_helper had an open-coded CRTC state destroy
which didn't actually call through to the driver's specified state
destroy. Fix that.

Signed-off-by: Daniel Stone <[email protected]>
Reviewed-by: Maarten Lankhorst <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index ab00286aec938ddc737c0588e46cf4616526c20f..d727b73fba3a43e95bb5d08bef3ea5133b33f70e 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -959,7 +959,12 @@ 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) {
-                       kfree(crtc_state);
+                       if (crtc->funcs->atomic_destroy_state) {
+                               crtc->funcs->atomic_destroy_state(crtc,
+                                                                 crtc_state);
+                       } else {
+                               kfree(crtc_state);
+                       }
 
                        return ret;
                }