Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_atomic_plane.c

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index e0b851a0004abd3dc2dde47e9b7af90e5a177510..7de7721f65bcee9f2d9df2736396809b078b965b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -195,12 +195,10 @@ static void intel_plane_atomic_update(struct drm_plane *plane,
        struct intel_plane_state *intel_state =
                to_intel_plane_state(plane->state);
        struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc;
-       struct drm_crtc_state *crtc_state =
-               drm_atomic_get_existing_crtc_state(old_state->state, crtc);
 
        if (intel_state->visible)
                intel_plane->update_plane(plane,
-                                         to_intel_crtc_state(crtc_state),
+                                         to_intel_crtc_state(crtc->state),
                                          intel_state);
        else
                intel_plane->disable_plane(plane, crtc);