aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9df96bdc002e..f0788a97801e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6333,6 +6333,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
6333 drm_gem_object_unreference(&work->pending_flip_obj->base); 6333 drm_gem_object_unreference(&work->pending_flip_obj->base);
6334 drm_gem_object_unreference(&work->old_fb_obj->base); 6334 drm_gem_object_unreference(&work->old_fb_obj->base);
6335 6335
6336 intel_update_fbc(work->dev);
6336 mutex_unlock(&work->dev->struct_mutex); 6337 mutex_unlock(&work->dev->struct_mutex);
6337 kfree(work); 6338 kfree(work);
6338} 6339}
@@ -6697,6 +6698,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
6697 if (ret) 6698 if (ret)
6698 goto cleanup_pending; 6699 goto cleanup_pending;
6699 6700
6701 intel_disable_fbc(dev);
6700 mutex_unlock(&dev->struct_mutex); 6702 mutex_unlock(&dev->struct_mutex);
6701 6703
6702 trace_i915_flip_request(intel_crtc->plane, obj); 6704 trace_i915_flip_request(intel_crtc->plane, obj);