Re: [Intel-gfx] [PATCH v3 08/14] drm/i915: Initialize MMIO access for each GT

Ceraolo Spurio, Daniele
2022-09-08T20:52:30Z

On 9/6/2022 4:49 PM, Matt Roper wrote:
> In a multi-GT system we need to initialize MMIO access for each GT, not
> just the primary GT.
>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Daniele

> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/i915_driver.c | 27 ++++++++++++++++++---------
> drivers/gpu/drm/i915/intel_uncore.c | 5 ++++-
> drivers/gpu/drm/i915/intel_uncore.h | 3 ++-
> 3 files changed, 24 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 1f46dd1ffaf7..bb9ba1aed1bb 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -431,7 +431,8 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)
> */
> static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
> {
> - int ret;
> + struct intel_gt *gt;
> + int ret, i;
>
> if (i915_inject_probe_failure(dev_priv))
> return -ENODEV;
> @@ -440,17 +441,27 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
> if (ret < 0)
> return ret;
>
> - ret = intel_uncore_init_mmio(&dev_priv->uncore);
> - if (ret)
> - return ret;
> + for_each_gt(gt, dev_priv, i) {
> + ret = intel_uncore_init_mmio(gt->uncore);
> + if (ret)
> + return ret;
> +
> + ret = drmm_add_action_or_reset(&dev_priv->drm,
> + intel_uncore_fini_mmio,
> + gt->uncore);
> + if (ret)
> + return ret;
> + }
>
> /* Try to make sure MCHBAR is enabled before poking at it */
> intel_setup_mchbar(dev_priv);
> intel_device_info_runtime_init(dev_priv);
>
> - ret = intel_gt_init_mmio(to_gt(dev_priv));
> - if (ret)
> - goto err_uncore;
> + for_each_gt(gt, dev_priv, i) {
> + ret = intel_gt_init_mmio(gt);
> + if (ret)
> + goto err_uncore;
> + }
>
> /* As early as possible, scrub existing GPU state before clobbering */
> sanitize_gpu(dev_priv);
> @@ -459,7 +470,6 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
>
> err_uncore:
> intel_teardown_mchbar(dev_priv);
> - intel_uncore_fini_mmio(&dev_priv->uncore);
>
> return ret;
> }
> @@ -471,7 +481,6 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv)
> static void i915_driver_mmio_release(struct drm_i915_private *dev_priv)
> {
> intel_teardown_mchbar(dev_priv);
> - intel_uncore_fini_mmio(&dev_priv->uncore);
> }
>
> /**
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 2a32f8a65f34..452b3a31e965 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -2455,8 +2455,11 @@ void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore,
> }
> }
>
> -void intel_uncore_fini_mmio(struct intel_uncore *uncore)
> +/* Called via drm-managed action */
> +void intel_uncore_fini_mmio(struct drm_device *dev, void *data)
> {
> + struct intel_uncore *uncore = data;
> +
> if (intel_uncore_has_forcewake(uncore)) {
> iosf_mbi_punit_acquire();
> iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(
> diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
> index 6100d0f4498a..4acb78a03233 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.h
> +++ b/drivers/gpu/drm/i915/intel_uncore.h
> @@ -33,6 +33,7 @@
>
> #include "i915_reg_defs.h"
>
> +struct drm_device;
> struct drm_i915_private;
> struct intel_runtime_pm;
> struct intel_uncore;
> @@ -220,7 +221,7 @@ void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore,
> bool intel_uncore_unclaimed_mmio(struct intel_uncore *uncore);
> bool intel_uncore_arm_unclaimed_mmio_detection(struct intel_uncore *uncore);
> void intel_uncore_cleanup_mmio(struct intel_uncore *uncore);
> -void intel_uncore_fini_mmio(struct intel_uncore *uncore);
> +void intel_uncore_fini_mmio(struct drm_device *dev, void *data);
> void intel_uncore_suspend(struct intel_uncore *uncore);
> void intel_uncore_resume_early(struct intel_uncore *uncore);
> void intel_uncore_runtime_resume(struct intel_uncore *uncore);