From: "Ceraolo Spurio, Daniele" <daniele.ceraolospurio@intel.com>
To: Matt Roper <matthew.d.roper@intel.com>,
<intel-gfx@lists.freedesktop.org>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v3 08/14] drm/i915: Initialize MMIO access for each GT
Date: Thu, 8 Sep 2022 13:52:22 -0700 [thread overview]
Message-ID: <d30a1777-b603-4ced-2737-b8a6208f0772@intel.com> (raw)
In-Reply-To: <20220906234934.3655440-9-matthew.d.roper@intel.com>
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);
next prev parent reply other threads:[~2022-09-08 20:52 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 23:49 [PATCH v3 00/14] i915: Add "standalone media" support for MTL Matt Roper
2022-09-06 23:49 ` [PATCH v3 01/14] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume} Matt Roper
2022-09-06 23:49 ` [PATCH v3 02/14] drm/i915: Only hook up uncore->debug for primary uncore Matt Roper
2022-09-06 23:49 ` [PATCH v3 03/14] drm/i915: Use managed allocations for extra uncore objects Matt Roper
2022-09-06 23:49 ` [PATCH v3 04/14] drm/i915: Drop intel_gt_tile_cleanup() Matt Roper
2022-09-07 0:07 ` Lucas De Marchi
2022-09-07 11:18 ` kernel test robot
2022-09-06 23:49 ` [PATCH v3 05/14] drm/i915: Prepare more multi-GT initialization Matt Roper
2022-09-08 16:19 ` Iddamsetty, Aravind
2022-09-06 23:49 ` [PATCH v3 06/14] drm/i915: Rename and expose common GT early init routine Matt Roper
2022-09-06 23:49 ` [PATCH v3 07/14] drm/i915: Use a DRM-managed action to release the PCI bridge device Matt Roper
2022-09-09 20:57 ` Sripada, Radhakrishna
2022-09-06 23:49 ` [PATCH v3 08/14] drm/i915: Initialize MMIO access for each GT Matt Roper
2022-09-08 20:52 ` Ceraolo Spurio, Daniele [this message]
2022-09-06 23:49 ` [PATCH v3 09/14] drm/i915: Handle each GT on init/release and suspend/resume Matt Roper
2022-09-08 20:55 ` Ceraolo Spurio, Daniele
2022-09-06 23:49 ` [PATCH v3 10/14] drm/i915/uncore: Add GSI offset to uncore Matt Roper
2022-09-08 21:16 ` Ceraolo Spurio, Daniele
2022-09-08 22:29 ` Matt Roper
2022-09-08 22:45 ` [PATCH v3.1 " Matt Roper
2022-09-08 22:53 ` Ceraolo Spurio, Daniele
2022-09-06 23:49 ` [PATCH v3 11/14] drm/i915/mtl: Add gsi_offset when emitting aux table invalidation Matt Roper
2022-09-07 16:16 ` Iddamsetty, Aravind
2022-09-06 23:49 ` [PATCH v3 12/14] drm/i915/xelpmp: Expose media as another GT Matt Roper
2022-09-08 16:22 ` Iddamsetty, Aravind
2022-09-06 23:49 ` [PATCH v3 13/14] drm/i915/mtl: Use primary GT's irq lock for media GT Matt Roper
2022-09-08 21:20 ` Ceraolo Spurio, Daniele
2022-09-06 23:49 ` [PATCH v3 14/14] drm/i915/mtl: Hook up interrupts for standalone media Matt Roper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d30a1777-b603-4ced-2737-b8a6208f0772@intel.com \
--to=daniele.ceraolospurio@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.d.roper@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).