Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80da2161 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Restore PDEs for all VMs 



In following with the old restore code, we must now restore ever PPGTT's
PDEs, since they aren't proper GEM ojbects.

v2: Rebased on BDW. Only do restore pdes for gen6 & 7

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9f273d48

drivers/gpu/drm/i915/i915_gem_gtt.c

+15 −2
Original line number Diff line number Diff line
@@ -1033,6 +1033,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_object *obj;

	struct i915_address_space *vm;



	i915_check_and_clear_faults(dev);
@@ -1057,8 +1058,20 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev) 
		vma->bind_vma(vma, obj->cache_level, GLOBAL_BIND);

	}





	if (INTEL_INFO(dev)->gen >= 8)

		return;



	list_for_each_entry(vm, &dev_priv->vm_list, global_link) {

		/* TODO: Perhaps it shouldn't be gen6 specific */

		if (i915_is_ggtt(vm)) {

			if (dev_priv->mm.aliasing_ppgtt)

				gen6_write_pdes(dev_priv->mm.aliasing_ppgtt);

			continue;

		}



		gen6_write_pdes(container_of(vm, struct i915_hw_ppgtt, base));

	}



	i915_gem_chipset_flush(dev);

}