diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-23 17:25:09 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-01-27 22:31:59 +0100 |
| commit | 67c964000236497e00c646472cd6b70b5c5109c8 (patch) | |
| tree | 5a38f8195cfba3a13b710049c684ed3956cf16f4 /drivers | |
| parent | Merge branch 'drm-kms-locking' of git://people.freedesktop.org/~danvet/drm-in... (diff) | |
| download | linux-67c964000236497e00c646472cd6b70b5c5109c8.tar.xz linux-67c964000236497e00c646472cd6b70b5c5109c8.zip | |
drm/i915: fixup per-crtc locking in intel_release_load_detect_pipe
One of the early return cases missed the mutex unlocking. Hilarity
ensued.
This regression has been introduced in
commit 7b24056be6db7ce907baffdd4cf142ab774ea60c
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Dec 12 00:35:33 2012 +0100
drm: don't hold crtc mutexes for connector ->detect callbacks
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59750
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Cancan Feng <cancan.feng@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8cda2ad19e26..53ec6cb0ffdb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6513,6 +6513,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector, drm_framebuffer_unreference(old->release_fb); } + mutex_unlock(&crtc->mutex); return; } |