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

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

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Michał Winiarski <michal.winiarski@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5319364f4c9416fed218382d020a57c5b0a17bee.1696236329.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index a3d68ff4b1918f5dce45983ccb3da9ce88aab058..bb6c3f68f7d21decd12f3f79860e28d734a8812b 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 70240f71d88610cc409ede396d47053518ace23a..20bbad165d76a0a0892b96299af9bb9514dfc31a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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 */

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 7de6477803f8faa834fb9d372509cf1a2eec4f3e..af349fd9abc2a1c13c12ca03f1a7fac7e2057287 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -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";
 }