aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-05-25 15:26:39 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-05-31 14:53:58 -0400
commit55d23285745b1be7bd25a2a4ba5ba79e05ab843a (patch)
treee13430f3621951a9fdc0b66630498cebdb5e6dc4 /drivers/gpu/drm
parentbb0364130fb0d272c838149b2ffe698a6c7afbfc (diff)
drm/i915: Call context fini at cleanup
If contexts were actually initialized, and we fail somewhere later during init this would possibly leak memory, and lead to some error messages about unclean takedown. As the odds of this occurring, and someone actually caring/noticing are pretty slim, the patch isn't terribly important. Found by code inspection while working on something else. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 45283679ac87..bd56c5560fa0 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1359,6 +1359,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
1359cleanup_gem: 1359cleanup_gem:
1360 mutex_lock(&dev->struct_mutex); 1360 mutex_lock(&dev->struct_mutex);
1361 i915_gem_cleanup_ringbuffer(dev); 1361 i915_gem_cleanup_ringbuffer(dev);
1362 i915_gem_context_fini(dev);
1362 mutex_unlock(&dev->struct_mutex); 1363 mutex_unlock(&dev->struct_mutex);
1363 i915_gem_cleanup_aliasing_ppgtt(dev); 1364 i915_gem_cleanup_aliasing_ppgtt(dev);
1364 drm_mm_takedown(&dev_priv->mm.gtt_space); 1365 drm_mm_takedown(&dev_priv->mm.gtt_space);