From: Ben Widawsky Date: Tue, 9 Apr 2013 01:43:55 +0000 (-0700) Subject: drm/i915: NULL aliasing_ppgtt on cleanup X-Git-Tag: v6.6-pxa1908~25584^2~40^2~33 X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5963cf049a044f41be7dc90c83756fb245f038b4;p=linux.git 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 [danvet: Spill the secrets about failing ppgtt init.] Signed-off-by: Daniel Vetter --- 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) return; ppgtt->cleanup(ppgtt); + dev_priv->mm.aliasing_ppgtt = NULL; } void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt,