---

yaml --- r: 180543 b: refs/heads/master c: 75dfca8 h: refs/heads/master i: 180541: 78d6e8d 180539: ee1b16b 180535: 45cc253 180527: 1f16342 180511: c0355c4 180479: ff0406e v: v3
git-mirror · Feb 11, 2010 · 96dfc2e · 96dfc2e
1 parent a56c676
commit 96dfc2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84b79f8d2882b0a84330c04839ed4d3cefd2ff77
+refs/heads/master: 75dfca80a610e4e87d3b9ccfb3f520692808697d
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4094,6 +4094,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
 
 	mutex_lock(&work->dev->struct_mutex);
 	i915_gem_object_unpin(work->old_fb_obj);
+	drm_gem_object_unreference(work->pending_flip_obj);
 	drm_gem_object_unreference(work->old_fb_obj);
 	mutex_unlock(&work->dev->struct_mutex);
 	kfree(work);
@@ -4221,8 +4222,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
 		return ret;
 	}
 
-	/* Reference the old fb object for the scheduled work. */
+	/* Reference the objects for the scheduled work. */
 	drm_gem_object_reference(work->old_fb_obj);
+	drm_gem_object_reference(obj);
 
 	crtc->fb = fb;
 	i915_gem_object_flush_write_domain(obj);