Commit 204129a2 authored by Michał Winiarski's avatar Michał Winiarski Committed by Matt Roper
Browse files

drm/i915: 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 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/20220104223550.56135-1-andi.shyti@linux.intel.com
parent 848915c3

drivers/gpu/drm/i915/gvt/dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int vgpu_gem_get_pages( 
		kfree(st);

		return ret;

	}

	gtt_entries = (gen8_pte_t __iomem *)dev_priv->ggtt.gsm +

	gtt_entries = (gen8_pte_t __iomem *)to_gt(dev_priv)->ggtt->gsm +

		(fb_info->start >> PAGE_SHIFT);

	for_each_sg(st->sgl, sg, page_num, i) {

		dma_addr_t dma_addr =

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -391,9 +391,9 @@ static int i915_swizzle_info(struct seq_file *m, void *data) 
	intel_wakeref_t wakeref;



	seq_printf(m, "bit6 swizzle for X-tiling = %s\n",

		   swizzle_string(dev_priv->ggtt.bit_6_swizzle_x));

		   swizzle_string(to_gt(dev_priv)->ggtt->bit_6_swizzle_x));

	seq_printf(m, "bit6 swizzle for Y-tiling = %s\n",

		   swizzle_string(dev_priv->ggtt.bit_6_swizzle_y));

		   swizzle_string(to_gt(dev_priv)->ggtt->bit_6_swizzle_y));



	if (dev_priv->quirks & QUIRK_PIN_SWIZZLED_PAGES)

		seq_puts(m, "L-shaped memory detected\n");

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ static int i915_drm_suspend(struct drm_device *dev) 


	intel_suspend_hw(dev_priv);



	i915_ggtt_suspend(&dev_priv->ggtt);

	i915_ggtt_suspend(to_gt(dev_priv)->ggtt);



	i915_save_display(dev_priv);
@@ -1257,7 +1257,7 @@ static int i915_drm_resume(struct drm_device *dev) 
	if (ret)

		drm_err(&dev_priv->drm, "failed to re-enable GGTT\n");



	i915_ggtt_resume(&dev_priv->ggtt);

	i915_ggtt_resume(to_gt(dev_priv)->ggtt);



	intel_dmc_ucode_resume(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1958,7 +1958,7 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objec 
{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);



	return i915->ggtt.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 &&

	return to_gt(i915)->ggtt->bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 &&

		i915_gem_object_is_tiled(obj);

}

drivers/gpu/drm/i915/i915_gem.c

+12 −11
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ int 
i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,

			    struct drm_file *file)

{

	struct i915_ggtt *ggtt = &to_i915(dev)->ggtt;

	struct drm_i915_private *i915 = to_i915(dev);

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

	struct drm_i915_gem_get_aperture *args = data;

	struct i915_vma *vma;

	u64 pinned;
@@ -289,7 +290,7 @@ static struct i915_vma *i915_gem_gtt_prepare(struct drm_i915_gem_object *obj, 
					     bool write)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_ggtt *ggtt = &i915->ggtt;

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

	struct i915_vma *vma;

	struct i915_gem_ww_ctx ww;

	int ret;
@@ -350,7 +351,7 @@ static void i915_gem_gtt_cleanup(struct drm_i915_gem_object *obj, 
				 struct i915_vma *vma)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_ggtt *ggtt = &i915->ggtt;

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



	i915_gem_object_unpin_pages(obj);

	if (drm_mm_node_allocated(node)) {
@@ -366,7 +367,7 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, 
		   const struct drm_i915_gem_pread *args)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_ggtt *ggtt = &i915->ggtt;

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

	intel_wakeref_t wakeref;

	struct drm_mm_node node;

	void __user *user_data;
@@ -522,7 +523,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, 
			 const struct drm_i915_gem_pwrite *args)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_ggtt *ggtt = &i915->ggtt;

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

	struct intel_runtime_pm *rpm = &i915->runtime_pm;

	intel_wakeref_t wakeref;

	struct drm_mm_node node;
@@ -823,7 +824,7 @@ void i915_gem_runtime_suspend(struct drm_i915_private *i915) 
	 */



	list_for_each_entry_safe(obj, on,

				 &i915->ggtt.userfault_list, userfault_link)

				 &to_gt(i915)->ggtt->userfault_list, userfault_link)

		__i915_gem_object_release_mmap_gtt(obj);



	/*
@@ -831,8 +832,8 @@ void i915_gem_runtime_suspend(struct drm_i915_private *i915) 
	 * in use by hardware (i.e. they are pinned), we should not be powering

	 * down! All other fences will be reacquired by the user upon waking.

	 */

	for (i = 0; i < i915->ggtt.num_fences; i++) {

		struct i915_fence_reg *reg = &i915->ggtt.fence_regs[i];

	for (i = 0; i < to_gt(i915)->ggtt->num_fences; i++) {

		struct i915_fence_reg *reg = &to_gt(i915)->ggtt->fence_regs[i];



		/*

		 * Ideally we want to assert that the fence register is not
@@ -873,7 +874,7 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, 
			    u64 size, u64 alignment, u64 flags)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct i915_ggtt *ggtt = &i915->ggtt;

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

	struct i915_vma *vma;

	int ret;
@@ -1123,7 +1124,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 


		/* Minimal basic recovery for KMS */

		ret = i915_ggtt_enable_hw(dev_priv);

		i915_ggtt_resume(&dev_priv->ggtt);

		i915_ggtt_resume(to_gt(dev_priv)->ggtt);

		intel_init_clock_gating(dev_priv);

	}
@@ -1146,7 +1147,7 @@ void i915_gem_driver_unregister(struct drm_i915_private *i915) 


void i915_gem_driver_remove(struct drm_i915_private *dev_priv)

{

	intel_wakeref_auto_fini(&dev_priv->ggtt.userfault_wakeref);

	intel_wakeref_auto_fini(&to_gt(dev_priv)->ggtt->userfault_wakeref);



	i915_gem_suspend_late(dev_priv);

	intel_gt_driver_remove(to_gt(dev_priv));