drm/armada: remove temporary crtc state

Now that we have the CRTC using the atomic modeset transitional helper,
there is no need to build a temporary crtc state anymore - we can use
the CRTC atomic state directly.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 5bb097b..0566739 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1099,13 +1099,13 @@ int armada_drm_plane_atomic_check(struct drm_plane *plane,
 {
        if (state->fb && !WARN_ON(!state->crtc)) {
                struct drm_crtc *crtc = state->crtc;
-               struct drm_crtc_state crtc_state = {
-                       .crtc = crtc,
-                       .enable = crtc->enabled,
-                       .mode = crtc->mode,
-               };
+               struct drm_crtc_state *crtc_state;
 
-               return drm_atomic_helper_check_plane_state(state, &crtc_state,
+               if (state->state)
+                       crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);
+               else
+                       crtc_state = crtc->state;
+               return drm_atomic_helper_check_plane_state(state, crtc_state,
                                                           0, INT_MAX,
                                                           true, false);
        } else {