From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 19 Oct 2010 08:13:00 +0000 (+0100)
Subject: Merge remote branch 'airlied/drm-core-next' into tmp
X-Git-Tag: v2.6.37-rc1~92^2~11^2~39
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fb9a90f7c674f3ddef6baf55cb1612dadd8ea752;p=linux.git

Merge remote branch 'airlied/drm-core-next' into tmp
---

fb9a90f7c674f3ddef6baf55cb1612dadd8ea752
diff --cc drivers/gpu/drm/i915/intel_fb.c
index b937ccfa7bec,521622b9be7a..af2a1dddc28e
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@@ -225,8 -225,8 +225,8 @@@ static void intel_fbdev_destroy(struct 
  
  	drm_framebuffer_cleanup(&ifb->base);
  	if (ifb->obj) {
- 		drm_gem_object_handle_unreference_unlocked(ifb->obj);
 -		drm_gem_object_unreference(ifb->obj);
 +		drm_gem_object_unreference_unlocked(ifb->obj);
+ 		ifb->obj = NULL;
  	}
  }