Commit a2e1319d authored Mar 30, 2017 by Maarten Lankhorst Committed by Daniel Vetter Mar 30, 2017

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

v2 of the commit 2c77bb29 ("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 <maarten.lankhorst@linux.intel.com>
Fixes: 2c77bb29 ("drm: simplify the locking in the GETCRTC ioctl")
Reported-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/6be47261-475f-c190-af56-c136677246d9@linux.intel.com

parent 1fa4da04

drivers/gpu/drm/i915/intel_display.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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 =