Merge remote branch 'airlied/drm-core-next' into tmp
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Oct 2010 08:13:00 +0000 (09:13 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 19 Oct 2010 08:14:50 +0000 (09:14 +0100)
1  2 
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c

Simple merge
Simple merge
index b937ccfa7bec9a037ae7b6fddf6d635552a4aba1,521622b9be7a7fa9ddebdd79813c5530c1d06425..af2a1dddc28e2e908529db44a24cea44ff10d387
@@@ -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;
        }
  }