| From 75ee4b5cd86b57376566578871801ab841293b76 Mon Sep 17 00:00:00 2001 |
| From: Ben Widawsky <ben@bwidawsk.net> |
| Date: Sat, 25 May 2013 12:26:39 -0700 |
| Subject: 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> |
| (cherry picked from commit 55d23285745b1be7bd25a2a4ba5ba79e05ab843a) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_dma.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/gpu/drm/i915/i915_dma.c |
| +++ b/drivers/gpu/drm/i915/i915_dma.c |
| @@ -1366,6 +1366,7 @@ static int i915_load_modeset_init(struct |
| cleanup_gem: |
| mutex_lock(&dev->struct_mutex); |
| i915_gem_cleanup_ringbuffer(dev); |
| + i915_gem_context_fini(dev); |
| mutex_unlock(&dev->struct_mutex); |
| i915_gem_cleanup_aliasing_ppgtt(dev); |
| drm_mm_takedown(&dev_priv->mm.gtt_space); |
