Commit 14aebb78 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/gt: remove i915->gt0 in favour of i915->gt[0] 



Since gt0 == i915->gt[0], just drop the former.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Acked-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5319364f4c9416fed218382d020a57c5b0a17bee.1696236329.git.jani.nikula@intel.com
parent 39fa9a7d

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

+1 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int intel_root_gt_init_early(struct drm_i915_private *i915) 
	if (!gt)

		return -ENOMEM;



	i915->gt0 = gt;

	i915->gt[0] = gt;



	gt->i915 = i915;

	gt->uncore = &i915->uncore;
@@ -917,8 +917,6 @@ int intel_gt_probe_all(struct drm_i915_private *i915) 
	if (ret)

		return ret;



	i915->gt[0] = gt;



	if (!HAS_EXTRA_GT_LIST(i915))

		return 0;

drivers/gpu/drm/i915/i915_drv.h

+1 −7
Original line number Diff line number Diff line
@@ -317,12 +317,6 @@ struct drm_i915_private { 


	struct i915_hwmon *hwmon;



	/* Abstract the submission mechanism (legacy ringbuffer or execlists) away */

	struct intel_gt *gt0;



	/*

	 * i915->gt[0] == i915->gt0

	 */

	struct intel_gt *gt[I915_MAX_GT];



	struct kobject *sysfs_gt;
@@ -384,7 +378,7 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) 


static inline struct intel_gt *to_gt(const struct drm_i915_private *i915)

{

	return i915->gt0;

	return i915->gt[0];

}



/* Simple iterator over all initialised engines */

drivers/gpu/drm/i915/selftests/mock_gem_device.c

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static struct dev_pm_domain pm_domain = { 


static void mock_gt_probe(struct drm_i915_private *i915)

{

	i915->gt[0] = to_gt(i915);

	i915->gt[0]->name = "Mock GT";

}