Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <maarten.lankhorst@linux.intel.com>
Fixes: 2c77bb29d398 ("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

authored by

Maarten Lankhorst and committed by
Daniel Vetter
a2e1319d 1fa4da04

-5
-5
drivers/gpu/drm/i915/intel_display.c
··· 12468 12468 ret = drm_atomic_helper_check_modeset(dev, state); 12469 12469 if (ret) 12470 12470 return ret; 12471 - /* enocder->atomic_check might upgrade some crtc to a full modeset */ 12472 - ret = drm_atomic_helper_check_modeset(dev, state); 12473 - if (ret) 12474 - return ret; 12475 - 12476 12471 12477 12472 for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, crtc_state, i) { 12478 12473 struct intel_crtc_state *pipe_config =