Commit 5c24c9d2 authored by Michał Winiarski's avatar Michał Winiarski Committed by Matt Roper
Browse files

drm/i915/gem: Use to_gt() helper for GGTT accesses 



GGTT is currently available both through i915->ggtt and gt->ggtt, and we
eventually want to get rid of the i915->ggtt one.
Use to_gt() for all i915->ggtt accesses to help with the future
refactoring.

Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: default avatarSujaritha Sundaresan <sujaritha.sundaresan@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211219212500.61432-4-andi.shyti@linux.intel.com
parent 204129a2

drivers/gpu/drm/i915/gem/i915_gem_context.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ i915_gem_context_get_eb_vm(struct i915_gem_context *ctx) 


	vm = ctx->vm;

	if (!vm)

		vm = &ctx->i915->ggtt.vm;

		vm = &to_gt(ctx->i915)->ggtt->vm;

	vm = i915_vm_get(vm);



	return vm;

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ static inline struct i915_ggtt *cache_to_ggtt(struct reloc_cache *cache) 
{

	struct drm_i915_private *i915 =

		container_of(cache, struct i915_execbuffer, reloc_cache)->i915;

	return &i915->ggtt;

	return to_gt(i915)->ggtt;

}



static void reloc_cache_unmap(struct reloc_cache *cache)

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+10 −9
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf) 
	struct drm_device *dev = obj->base.dev;

	struct drm_i915_private *i915 = to_i915(dev);

	struct intel_runtime_pm *rpm = &i915->runtime_pm;

	struct i915_ggtt *ggtt = &i915->ggtt;

	struct i915_ggtt *ggtt = to_gt(i915)->ggtt;

	bool write = area->vm_flags & VM_WRITE;

	struct i915_gem_ww_ctx ww;

	intel_wakeref_t wakeref;
@@ -387,16 +387,16 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf) 
	assert_rpm_wakelock_held(rpm);



	/* Mark as being mmapped into userspace for later revocation */

	mutex_lock(&i915->ggtt.vm.mutex);

	mutex_lock(&to_gt(i915)->ggtt->vm.mutex);

	if (!i915_vma_set_userfault(vma) && !obj->userfault_count++)

		list_add(&obj->userfault_link, &i915->ggtt.userfault_list);

	mutex_unlock(&i915->ggtt.vm.mutex);

		list_add(&obj->userfault_link, &to_gt(i915)->ggtt->userfault_list);

	mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);



	/* Track the mmo associated with the fenced vma */

	vma->mmo = mmo;



	if (CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND)

		intel_wakeref_auto(&i915->ggtt.userfault_wakeref,

		intel_wakeref_auto(&to_gt(i915)->ggtt->userfault_wakeref,

				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));



	if (write) {
@@ -511,7 +511,7 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj) 
	 * wakeref.

	 */

	wakeref = intel_runtime_pm_get(&i915->runtime_pm);

	mutex_lock(&i915->ggtt.vm.mutex);

	mutex_lock(&to_gt(i915)->ggtt->vm.mutex);



	if (!obj->userfault_count)

		goto out;
@@ -529,7 +529,7 @@ void i915_gem_object_release_mmap_gtt(struct drm_i915_gem_object *obj) 
	wmb();



out:

	mutex_unlock(&i915->ggtt.vm.mutex);

	mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);

	intel_runtime_pm_put(&i915->runtime_pm, wakeref);

}
@@ -732,13 +732,14 @@ i915_gem_dumb_mmap_offset(struct drm_file *file, 
			  u32 handle,

			  u64 *offset)

{

	struct drm_i915_private *i915 = to_i915(dev);

	enum i915_mmap_type mmap_type;



	if (HAS_LMEM(to_i915(dev)))

		mmap_type = I915_MMAP_TYPE_FIXED;

	else if (pat_enabled())

		mmap_type = I915_MMAP_TYPE_WC;

	else if (!i915_ggtt_has_aperture(&to_i915(dev)->ggtt))

	else if (!i915_ggtt_has_aperture(to_gt(i915)->ggtt))

		return -ENODEV;

	else

		mmap_type = I915_MMAP_TYPE_GTT;
@@ -786,7 +787,7 @@ i915_gem_mmap_offset_ioctl(struct drm_device *dev, void *data, 


	switch (args->flags) {

	case I915_MMAP_OFFSET_GTT:

		if (!i915_ggtt_has_aperture(&i915->ggtt))

		if (!i915_ggtt_has_aperture(to_gt(i915)->ggtt))

			return -ENODEV;

		type = I915_MMAP_TYPE_GTT;

		break;

drivers/gpu/drm/i915/gem/i915_gem_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void i915_gem_suspend(struct drm_i915_private *i915) 
{

	GEM_TRACE("%s\n", dev_name(i915->drm.dev));



	intel_wakeref_auto(&i915->ggtt.userfault_wakeref, 0);

	intel_wakeref_auto(&to_gt(i915)->ggtt->userfault_wakeref, 0);

	flush_workqueue(i915->wq);



	/*

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

+3 −3
Original line number Diff line number Diff line
@@ -401,9 +401,9 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr 
					       I915_SHRINK_VMAPS);



	/* We also want to clear any cached iomaps as they wrap vmap */

	mutex_lock(&i915->ggtt.vm.mutex);

	mutex_lock(&to_gt(i915)->ggtt->vm.mutex);

	list_for_each_entry_safe(vma, next,

				 &i915->ggtt.vm.bound_list, vm_link) {

				 &to_gt(i915)->ggtt->vm.bound_list, vm_link) {

		unsigned long count = vma->node.size >> PAGE_SHIFT;

		struct drm_i915_gem_object *obj = vma->obj;
@@ -418,7 +418,7 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr 


		i915_gem_object_unlock(obj);

	}

	mutex_unlock(&i915->ggtt.vm.mutex);

	mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);



	*(unsigned long *)ptr += freed_pages;

	return NOTIFY_DONE;