Commit d3b448d9 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm/i915: Only unpin the default ctx object if it exists

Since commit 691e6415
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Apr 9 09:07:36 2014 +0100

    drm/i915: Always use kref tracking for all contexts.

we have contexts everywhere, and so we must be careful to distinguish
fake contexts, which do not have an associated bo, and real ones, which
do. In particular, we now need to be careful not to dereference NULL
pointers.

This is one such example, as the commit highlighted above failed to move
the unpinning of the default ctx object into the real-context-only
branch.
Reported-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78792Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 823c6909
...@@ -449,6 +449,8 @@ void i915_gem_context_fini(struct drm_device *dev) ...@@ -449,6 +449,8 @@ void i915_gem_context_fini(struct drm_device *dev)
i915_gem_context_unreference(dctx); i915_gem_context_unreference(dctx);
dev_priv->ring[RCS].last_context = NULL; dev_priv->ring[RCS].last_context = NULL;
} }
i915_gem_object_ggtt_unpin(dctx->obj);
} }
for (i = 0; i < I915_NUM_RINGS; i++) { for (i = 0; i < I915_NUM_RINGS; i++) {
...@@ -461,7 +463,6 @@ void i915_gem_context_fini(struct drm_device *dev) ...@@ -461,7 +463,6 @@ void i915_gem_context_fini(struct drm_device *dev)
ring->last_context = NULL; ring->last_context = NULL;
} }
i915_gem_object_ggtt_unpin(dctx->obj);
i915_gem_context_unreference(dctx); i915_gem_context_unreference(dctx);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment