diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-12-13 20:16:40 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-12-13 20:16:40 -0300 |
| commit | 6baeafd1f2a54ca041ff71778ebda9fac75aad12 (patch) | |
| tree | 57d2d68fa5d1d91f57cd7fcf0aed0a97892cc8cc /drivers/gpu/drm/i915/intel_display.c | |
| parent | 189382f7a338c02b448ab27e1d5566e052165dc8 (diff) | |
Linux-libre 4.8.14-gnuHEADpck-4.8.14-gnumaster
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e26f88965..35d385d70 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11791,7 +11791,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, intel_crtc->reset_counter = i915_reset_counter(&dev_priv->gpu_error); if (__i915_reset_in_progress_or_wedged(intel_crtc->reset_counter)) { ret = -EIO; - goto cleanup; + goto unlock; } atomic_inc(&intel_crtc->unpin_work_count); @@ -11877,6 +11877,7 @@ cleanup_pending: if (!IS_ERR_OR_NULL(request)) i915_add_request_no_flush(request); atomic_dec(&intel_crtc->unpin_work_count); +unlock: mutex_unlock(&dev->struct_mutex); cleanup: crtc->primary->fb = old_fb; |