]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: NULL aliasing_ppgtt on cleanup
authorBen Widawsky <benjamin.widawsky@intel.com>
Tue, 9 Apr 2013 01:43:55 +0000 (18:43 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 18 Apr 2013 07:43:15 +0000 (09:43 +0200)
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>
drivers/gpu/drm/i915/i915_gem_gtt.c

index c56de21af910f13d33ccd7335990cdd5c0649293..d32912e07bad09648ba4360a50ee5035411d6575 100644 (file)
@@ -316,6 +316,7 @@ void i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev)
                return;
 
        ppgtt->cleanup(ppgtt);
+       dev_priv->mm.aliasing_ppgtt = NULL;
 }
 
 void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,