From 96dfc2e383757bd722329f6424eb0224456be558 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 10 Feb 2010 15:09:44 -0800
Subject: [PATCH] --- yaml --- r: 180543 b: refs/heads/master c:
 75dfca80a610e4e87d3b9ccfb3f520692808697d h: refs/heads/master i:   180541:
 78d6e8d6b065634fc7113a7ee015e12cec312022   180539:
 ee1b16b880035ac44f5297b85d44750a63c96f34   180535:
 45cc253dadee28e504535658a1ae32a47572cadf   180527:
 1f16342864c24d4693ca5cd5b4d424df21b6190f   180511:
 c0355c4cc4378320c3a134d6d7b3bd7d7068a208   180479:
 ff0406ef0a9aedb9d3101eebca7654bf1e0cbeae v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 07f37b28cb28..d4409b420d88 100644
--- 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
index c161ace7132d..b27202d23ebc 100644
--- 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);