diff options
| author | Maarten Lankhorst | 2017-03-30 09:36:05 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2017-03-30 09:55:46 +0200 |
| commit | a2e1319d1f496888c2eaca57fbfc17180b0dae95 (patch) | |
| tree | 81055952879330b5d6e8eac4d0f2f6abc813ee3f | |
| parent | drm: Fixup failure paths in drm_atomic_helper_set_config (diff) | |
| download | kernel-qcow2-linux-a2e1319d1f496888c2eaca57fbfc17180b0dae95.tar.gz kernel-qcow2-linux-a2e1319d1f496888c2eaca57fbfc17180b0dae95.tar.xz kernel-qcow2-linux-a2e1319d1f496888c2eaca57fbfc17180b0dae95.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 78994fdc00a4..e27ea89efd67 100644 --- 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 = |