diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-07-20 11:58:00 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-26 11:27:46 -0700 |
| commit | fbd41a7e5843be27386c48b3d0816e93e7865d5d (patch) | |
| tree | 17a851e7577e5be3ad4423fb669f6752d5d7e014 | |
| parent | aebf0dafee1a0a22b3d25db8107c6479db4aaebe (diff) | |
| download | op-kernel-dev-fbd41a7e5843be27386c48b3d0816e93e7865d5d.zip op-kernel-dev-fbd41a7e5843be27386c48b3d0816e93e7865d5d.tar.gz | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |
