Revert unrelated part of "drm: simplify the locking in the GETCRTC ioctl"

v2 of the commit 2c77bb29d398 ("drm: simplify the locking in the GETCRTC ioctl")
accidentally introduced a unrelated change in intel_display.c, revert the
unrelated change.

Signed-off-by: Maarten Lankhorst <[email protected]>
Fixes: 2c77bb29d398 ("drm: simplify the locking in the GETCRTC ioctl")
Reported-by: Dhinakaran Pandiyan <[email protected]>
Reviewed-by: Dhinakaran Pandiyan <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 78994fdc00a4ba739c1c66366cc9602257849e53..e27ea89efd6788b47087467c29b0f991ae8d2ffd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12468,11 +12468,6 @@ static int intel_atomic_check(struct drm_device *dev,
        ret = drm_atomic_helper_check_modeset(dev, state);
        if (ret)
                return ret;
-       /* enocder->atomic_check might upgrade some crtc to a full modeset */
-       ret = drm_atomic_helper_check_modeset(dev, state);
-       if (ret)
-               return ret;
-
 
        for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, crtc_state, i) {
                struct intel_crtc_state *pipe_config =