From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 20 Jul 2010 18:58:00 +0000 (-0700)
Subject: drm/i915: fix deadlock in fb teardown
X-Git-Tag: v2.6.35~33^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbd41a7e5843be27386c48b3d0816e93e7865d5d;p=platform%2Fkernel%2Flinux-stable.git

drm/i915: fix deadlock in fb teardown

At module unload time we'll tear down the fbdev state.  We do so under
the struct mutex, so we shouldn't try to use the unlocked variant of
the GEM object unreference function or we may deadlock.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 0f4946a..3e18c9e 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -236,7 +236,7 @@ int intel_fbdev_destroy(struct drm_device *dev,
 
 	drm_framebuffer_cleanup(&ifb->base);
 	if (ifb->obj)
-		drm_gem_object_unreference_unlocked(ifb->obj);
+		drm_gem_object_unreference(ifb->obj);
 
 	return 0;
 }