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

drm/i915/gt: Use to_gt() helper 



Use to_gt() helper consistently throughout the codebase.
Pure mechanical s/i915->gt/to_gt(i915). No functional changes.

Signed-off-by: default avatarMichał Winiarski <michal.winiarski@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/20211214193346.21231-5-andi.shyti@linux.intel.com
parent 62e94f92

drivers/gpu/drm/i915/gt/intel_engine_user.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void set_scheduler_caps(struct drm_i915_private *i915) 
			disabled |= (I915_SCHEDULER_CAP_ENABLED |

				     I915_SCHEDULER_CAP_PRIORITY);



		if (intel_uc_uses_guc_submission(&i915->gt.uc))

		if (intel_uc_uses_guc_submission(&to_gt(i915)->uc))

			enabled |= I915_SCHEDULER_CAP_STATIC_PRIORITY_MAP;



		for (i = 0; i < ARRAY_SIZE(map); i++) {

drivers/gpu/drm/i915/gt/intel_ggtt.c

+1 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *i915) 
{

	int ret;



	ret = ggtt_probe_hw(&i915->ggtt, &i915->gt);

	ret = ggtt_probe_hw(&i915->ggtt, to_gt(i915));

	if (ret)

		return ret;

drivers/gpu/drm/i915/gt/intel_rps.c

+6 −6
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ unsigned long i915_read_mch_val(void) 
		return 0;



	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {

		struct intel_ips *ips = &i915->gt.rps.ips;

		struct intel_ips *ips = &to_gt(i915)->rps.ips;



		spin_lock_irq(&mchdev_lock);

		chipset_val = __ips_chipset_val(ips);
@@ -2329,7 +2329,7 @@ bool i915_gpu_raise(void) 
	if (!i915)

		return false;



	rps = &i915->gt.rps;

	rps = &to_gt(i915)->rps;



	spin_lock_irq(&mchdev_lock);

	if (rps->max_freq_softlimit < rps->max_freq)
@@ -2356,7 +2356,7 @@ bool i915_gpu_lower(void) 
	if (!i915)

		return false;



	rps = &i915->gt.rps;

	rps = &to_gt(i915)->rps;



	spin_lock_irq(&mchdev_lock);

	if (rps->max_freq_softlimit > rps->min_freq)
@@ -2382,7 +2382,7 @@ bool i915_gpu_busy(void) 
	if (!i915)

		return false;



	ret = i915->gt.awake;

	ret = to_gt(i915)->awake;



	drm_dev_put(&i915->drm);

	return ret;
@@ -2405,11 +2405,11 @@ bool i915_gpu_turbo_disable(void) 
	if (!i915)

		return false;



	rps = &i915->gt.rps;

	rps = &to_gt(i915)->rps;



	spin_lock_irq(&mchdev_lock);

	rps->max_freq_softlimit = rps->min_freq;

	ret = !__gen5_rps_set(&i915->gt.rps, rps->min_freq);

	ret = !__gen5_rps_set(&to_gt(i915)->rps, rps->min_freq);

	spin_unlock_irq(&mchdev_lock);



	drm_dev_put(&i915->drm);

drivers/gpu/drm/i915/gt/intel_workarounds.c

+1 −1
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ hsw_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) 
static void

gen9_wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)

{

	const struct sseu_dev_info *sseu = &i915->gt.info.sseu;

	const struct sseu_dev_info *sseu = &to_gt(i915)->info.sseu;

	unsigned int slice, subslice;

	u32 mcr, mcr_mask;

drivers/gpu/drm/i915/gt/mock_engine.c

+5 −5
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, 
	struct mock_engine *engine;



	GEM_BUG_ON(id >= I915_NUM_ENGINES);

	GEM_BUG_ON(!i915->gt.uncore);

	GEM_BUG_ON(!to_gt(i915)->uncore);



	engine = kzalloc(sizeof(*engine) + PAGE_SIZE, GFP_KERNEL);

	if (!engine)
@@ -353,8 +353,8 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, 


	/* minimal engine setup for requests */

	engine->base.i915 = i915;

	engine->base.gt = &i915->gt;

	engine->base.uncore = i915->gt.uncore;

	engine->base.gt = to_gt(i915);

	engine->base.uncore = to_gt(i915)->uncore;

	snprintf(engine->base.name, sizeof(engine->base.name), "%s", name);

	engine->base.id = id;

	engine->base.mask = BIT(id);
@@ -377,8 +377,8 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, 


	engine->base.release = mock_engine_release;



	i915->gt.engine[id] = &engine->base;

	i915->gt.engine_class[0][id] = &engine->base;

	to_gt(i915)->engine[id] = &engine->base;

	to_gt(i915)->engine_class[0][id] = &engine->base;



	/* fake hw queue */

	spin_lock_init(&engine->hw_lock);