drm/i915: Pass intel_gt to intel_engines_setup

Engines belong to the GT so make it indicative in the API.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191022094726.3001-5-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_engine.h b/drivers/gpu/drm/i915/gt/intel_engine.h
index 8675d8ea8c5a30a8f89f65194c5b0f7e07db2216..a947bbb60a2201b0a44b9397018be6fc81e95d63 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine.h
@@ -325,7 +325,7 @@ __intel_ring_space(unsigned int head, unsigned int tail, unsigned int size)
 }
 
 int intel_engines_init_mmio(struct intel_gt *gt);
-int intel_engines_setup(struct drm_i915_private *i915);
+int intel_engines_setup(struct intel_gt *gt);
 int intel_engines_init(struct drm_i915_private *i915);
 void intel_engines_cleanup(struct intel_gt *gt);
 

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index ce7cab474e8c714d39d4fffdcce6fbd42adeef03..af64f9079b0f10746a0a938a037582bef52ebd66 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -623,26 +623,26 @@ static int intel_engine_setup_common(struct intel_engine_cs *engine)
 
 /**
  * intel_engines_setup- setup engine state not requiring hw access
- * @i915: Device to setup.
+ * @gt: pointer to struct intel_gt
  *
  * Initializes engine structure members shared between legacy and execlists
  * submission modes which do not require hardware access.
  *
  * Typically done early in the submission mode specific engine setup stage.
  */
-int intel_engines_setup(struct drm_i915_private *i915)
+int intel_engines_setup(struct intel_gt *gt)
 {
        int (*setup)(struct intel_engine_cs *engine);
        struct intel_engine_cs *engine;
        enum intel_engine_id id;
        int err;
 
-       if (HAS_EXECLISTS(i915))
+       if (HAS_EXECLISTS(gt->i915))
                setup = intel_execlists_submission_setup;
        else
                setup = intel_ring_submission_setup;
 
-       for_each_engine(engine, i915, id) {
+       for_each_engine(engine, gt, id) {
                err = intel_engine_setup_common(engine);
                if (err)
                        goto cleanup;
@@ -660,7 +660,7 @@ int intel_engines_setup(struct drm_i915_private *i915)
        return 0;
 
 cleanup:
-       intel_engines_cleanup(&i915->gt);
+       intel_engines_cleanup(gt);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index fcc35912e42a0a60f379b8aa4257376a02a4de7a..fb45c7ecc607ab7f12d38820b6e749bcd3d9cee4 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1249,7 +1249,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
 
        intel_gt_init(&dev_priv->gt);
 
-       ret = intel_engines_setup(dev_priv);
+       ret = intel_engines_setup(&dev_priv->gt);
        if (ret) {
                GEM_BUG_ON(ret == -EIO);
                goto err_unlock;