diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-04-08 21:43:55 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-18 03:43:15 -0400 |
commit | 5963cf049a044f41be7dc90c83756fb245f038b4 (patch) | |
tree | 09cc0a87e6241ac7fe72b29c1b566a96085b0aac | |
parent | 6197349bdeb97ee6f533990617c51c67ac233f79 (diff) |
drm/i915: NULL aliasing_ppgtt on cleanup
This will allow us to carry on if we've cleaned up the PPGTT. The usage
for this is coming up - it simplifies handling a failed PPGTT init.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: Spill the secrets about failing ppgtt init.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index c56de21af910..d32912e07bad 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c | |||
@@ -316,6 +316,7 @@ void i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev) | |||
316 | return; | 316 | return; |
317 | 317 | ||
318 | ppgtt->cleanup(ppgtt); | 318 | ppgtt->cleanup(ppgtt); |
319 | dev_priv->mm.aliasing_ppgtt = NULL; | ||
319 | } | 320 | } |
320 | 321 | ||
321 | void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, | 322 | void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, |