i915: Add "standalone media" support for MTL
Subsystems (2)
v2 cover i915: Add "standalone media" support for MTL
Starting with MTL, media functionality has moved into a new, second GT at the hardware level. This new GT, referred to as "standalone media" in the spec, has its own GuC, power management/forcewake, etc. The general non-engine GT registers for standalone media start at 0x380000, but otherwise use the same MMIO offsets as the primary GT.
Standalone media has a lot of similarity to the remote tiles present on platforms like xehpsdv and pvc, and our i915 implementation can share much of the general "multi GT" infrastructure between the two types of platforms. However there are a few notable differences we must deal with:
- The 0x380000 offset only applies to the non-engine GT registers (which the specs refer to as "GSI" registers). The engine registers remain at their usual locations (e.g., 0x1C0000 for VCS0).
- Unlike platforms with remote tiles, all interrupt handling for standalone media still happens via the primary GT.
v2:
- Added new patches to ensure each GT, not just the primary, is handled properly during various init/suspend/resume/teardown flows.
- Simplified GSI offset handling and split it into its own patch.
- Correct gt->irq_lock assignment for media GT.
- Fix jump target for intel_root_gt_init_early() errors.
Matt Roper (12):
drm/i915: Move locking and unclaimed check into
mmio_debug_{suspend,resume} drm/i915: Only hook up uncore->debug for primary uncore drm/i915: Use managed allocations for extra uncore objects drm/i915: Prepare more multi-GT initialization
drm/i915: Rename and expose common GT early init routine drm/i915: Use a DRM-managed action to release the PCI bridge device drm/i915: Initialize MMIO access for each GT
drm/i915: Handle each GT on init/release and suspend/resume drm/i915/uncore: Add GSI offset to uncore drm/i915/xelpmp: Expose media as another GT drm/i915/mtl: Use primary GT's irq lock for media GT drm/i915/mtl: Hook up interrupts for standalone media
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 10 +- drivers/gpu/drm/i915/gt/intel_gt.c | 96 ++++++++++++---- drivers/gpu/drm/i915/gt/intel_gt.h | 4 +- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 35 ++++-- drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 8 +- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 10 ++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 +- drivers/gpu/drm/i915/gt/intel_rps.c | 26 ++--- drivers/gpu/drm/i915/gt/intel_sa_media.c | 47 ++++++++ drivers/gpu/drm/i915/gt/intel_sa_media.h | 15 +++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 24 ++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 105 ++++++++++++------ drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_irq.c | 4 +- drivers/gpu/drm/i915/i915_pci.c | 15 +++ drivers/gpu/drm/i915/intel_device_info.h | 19 ++++ drivers/gpu/drm/i915/intel_uncore.c | 83 +++++++++----- drivers/gpu/drm/i915/intel_uncore.h | 28 ++++- drivers/gpu/drm/i915/pxp/intel_pxp.c | 4 +- drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 14 +-- drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 4 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 1 + 25 files changed, 424 insertions(+), 147 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.c create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.h
Signature · 1 line
2.37.2
PATCH v2 1/12 drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}
Moving the locking for MMIO debug (and the final check for unclaimed accesses when resuming debug after a userspace-initiated forcewake) will make it simpler to completely skip MMIO debug handling on uncores that don't support it in future patches.
--- drivers/gpu/drm/i915/intel_uncore.c | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +21 -20
@@ -50,23 +50,33 @@ intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug) mmio_debug->unclaimed_mmio_check =1 ; } -static void mmio_debug_suspend (struct intel_uncore_mmio_debug *mmio_debug) +static void mmio_debug_suspend (struct intel_uncore *uncore) { -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock);/* Save and disable mmio debugging for the user bypass */ -if (!mmio_debug->suspend_count++) { - mmio_debug->saved_mmio_check = mmio_debug->unclaimed_mmio_check; - mmio_debug->unclaimed_mmio_check =0 ; +if (!uncore->debug->suspend_count++) { + uncore->debug->saved_mmio_check = uncore->debug->unclaimed_mmio_check; + uncore->debug->unclaimed_mmio_check =0 ; } + +spin_unlock (&uncore->debug->lock); } -static void mmio_debug_resume (struct intel_uncore_mmio_debug *mmio_debug) +static bool check_for_unclaimed_mmio (struct intel_uncore *uncore); + +static void mmio_debug_resume (struct intel_uncore *uncore) { -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock); + +if (!--uncore->debug->suspend_count) + uncore->debug->unclaimed_mmio_check = uncore->debug->saved_mmio_check; -if (!--mmio_debug->suspend_count) - mmio_debug->unclaimed_mmio_check = mmio_debug->saved_mmio_check; +if (check_for_unclaimed_mmio (uncore)) +drm_info (&uncore->i915->drm, +"Invalid mmio detected during user access\n" ); + +spin_unlock (&uncore->debug->lock); }static const char *const forcewake_domain_names[] = {
@@ -677,9 +687,7 @@ void intel_uncore_forcewake_user_get(struct intel_uncore *uncore)spin_lock_irq (&uncore->lock);if (!uncore->user_forcewake_count++) {intel_uncore_forcewake_get__locked (uncore,FORCEWAKE_ALL ); -spin_lock (&uncore->debug->lock); -mmio_debug_suspend (uncore->debug); -spin_unlock (&uncore->debug->lock); +mmio_debug_suspend (uncore); }spin_unlock_irq (&uncore->lock); }
@@ -695,14 +703,7 @@ void intel_uncore_forcewake_user_put(struct intel_uncore *uncore) {spin_lock_irq (&uncore->lock);if (!--uncore->user_forcewake_count) { -spin_lock (&uncore->debug->lock); -mmio_debug_resume (uncore->debug); - -if (check_for_unclaimed_mmio (uncore)) -drm_info (&uncore->i915->drm, -"Invalid mmio detected during user access\n" ); -spin_unlock (&uncore->debug->lock); - +mmio_debug_resume (uncore);intel_uncore_forcewake_put__locked (uncore,FORCEWAKE_ALL ); }spin_unlock_irq (&uncore->lock);
Signature · 1 line
2.37.2
RE: [PATCH v2 01/12] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}
Quoted 27 lines
-----Original Message-----
From: dri-devel <[email protected]> On Behalf Of Matt Roper
Sent: Friday, September 2, 2022 7:33 PM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>
Subject: [PATCH v2 01/12] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}Moving the locking for MMIO debug (and the final check for unclaimed accesses when resuming debug after a userspace-initiated forcewake) will make it simpler to completely skip MMIO debug handling on uncores that don't support it in future patches.
Signed-off-by Matt Roper <[email protected]>Reviewed-by Radhakrishna Sripada <[email protected]>---
drivers/gpu/drm/i915/intel_uncore.c| 41 +++++++++++++++--------------1 file changed, 21 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/intel_uncore.c +0
-0
drivers/gpu/drm/i915/intel_uncore.c intel_uncore_mmio_debug_init_early(struct · line 55
Quoted 7 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -50,23 +50,33 @@ intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug) mmio_debug->unclaimed_mmio_check = 1; } -static void mmio_debug_suspend (struct intel_uncore_mmio_debug *mmio_debug) +static void mmio_debug_suspend (struct intel_uncore *uncore)
/bike-shedding...
It seems like there has been a tend to name functions with the
_unlocked
postfix when the lock is being taken within the function.
Would this be a reasonable name update for these changes?
M
Quoted 76 lines
drivers/gpu/drm/i915/intel_uncore.c +13
-8{ -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock);/* Save and disable mmio debugging for the user bypass */ -if (!mmio_debug->suspend_count++) { - mmio_debug->saved_mmio_check = mmio_debug- >unclaimed_mmio_check; - mmio_debug->unclaimed_mmio_check =0 ; +if (!uncore->debug->suspend_count++) { + uncore->debug->saved_mmio_check = uncore->debug- >unclaimed_mmio_check; + uncore->debug->unclaimed_mmio_check =0 ; } + +spin_unlock (&uncore->debug->lock); } -static void mmio_debug_resume (struct intel_uncore_mmio_debug *mmio_debug) +static bool check_for_unclaimed_mmio (struct intel_uncore *uncore); + +static void mmio_debug_resume (struct intel_uncore *uncore) { -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock); + +if (!--uncore->debug->suspend_count) + uncore->debug->unclaimed_mmio_check = uncore->debug- >saved_mmio_check; -if (!--mmio_debug->suspend_count) - mmio_debug->unclaimed_mmio_check = mmio_debug-Quoted 1 line
saved_mmio_check;drivers/gpu/drm/i915/intel_uncore.c +5
-0+if (check_for_unclaimed_mmio (uncore)) +drm_info (&uncore->i915->drm, +"Invalid mmio detected during user access\n" ); + +spin_unlock (&uncore->debug->lock);}
static const char * const forcewake_domain_names[] = {
drivers/gpu/drm/i915/intel_uncore.c +1
-3@@ -677,9 +687,7 @@ void intel_uncore_forcewake_user_get(struct intel_uncore *uncore) spin_lock_irq(&uncore->lock);if (!uncore->user_forcewake_count++) {intel_uncore_forcewake_get__locked (uncore,FORCEWAKE_ALL ); -spin_lock (&uncore->debug->lock); -mmio_debug_suspend (uncore->debug); -spin_unlock (&uncore->debug->lock); +mmio_debug_suspend (uncore); }spin_unlock_irq(&uncore->lock); }drivers/gpu/drm/i915/intel_uncore.c +1
-8@@ -695,14 +703,7 @@ void intel_uncore_forcewake_user_put(struct intel_uncore *uncore) {spin_lock_irq (&uncore->lock);if (!--uncore->user_forcewake_count) { -spin_lock (&uncore->debug->lock); -mmio_debug_resume (uncore->debug); - -if (check_for_unclaimed_mmio (uncore)) -drm_info (&uncore->i915->drm, -"Invalid mmio detected during user access\n"); -spin_unlock (&uncore->debug->lock); - + mmio_debug_resume(uncore); intel_uncore_forcewake_put__locked(uncore,FORCEWAKE_ALL); } spin_unlock_irq(&uncore->lock);--
2.37.2
Re: [PATCH v2 01/12] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}
Quoted 37 lines · Michael J
Quoted 27 lines
-----Original Message-----
From: dri-devel <[email protected]> On Behalf Of Matt Roper
Sent: Friday, September 2, 2022 7:33 PM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>
Subject: [PATCH v2 01/12] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}Moving the locking for MMIO debug (and the final check for unclaimed accesses when resuming debug after a userspace-initiated forcewake) will make it simpler to completely skip MMIO debug handling on uncores that don't support it in future patches.
Signed-off-by Matt Roper <[email protected]>Reviewed-by Radhakrishna Sripada <[email protected]>---
drivers/gpu/drm/i915/intel_uncore.c| 41 +++++++++++++++--------------1 file changed, 21 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/intel_uncore.c +0
-0drivers/gpu/drm/i915/intel_uncore.c intel_uncore_mmio_debug_init_early(struct · line 55
Quoted 7 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -50,23 +50,33 @@ intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug) mmio_debug->unclaimed_mmio_check = 1; } -static void mmio_debug_suspend (struct intel_uncore_mmio_debug *mmio_debug) +static void mmio_debug_suspend (struct intel_uncore *uncore)/bike-shedding...
Quoted 7 lines
It seems like there has been a tend to name functions with the
_unlockedpostfix when the lock is being taken within the function.
Would this be a reasonable name update for these changes?
I think foo_unlocked() naming is usually used when there's also a separate foo() that can be called if/when locks are already held (or sometimes it's foo() and foo_locked() if the situation is the other way around). In this case we still only have one version of the function, and it's only called from a single place in the code (intel_uncore_forcewake_user_get) so I don't think the special naming is necessary. It might actually add confusion here since there's a different lock (the general uncore lock) that is still held by the caller. It's just the mmio_debug-specific lock that's been moved into the mmio-debug specific function here.
Matt
Quoted 80 lines
M
Quoted 76 lines
drivers/gpu/drm/i915/intel_uncore.c +13
-8{ -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock);/* Save and disable mmio debugging for the user bypass */ -if (!mmio_debug->suspend_count++) { - mmio_debug->saved_mmio_check = mmio_debug- >unclaimed_mmio_check; - mmio_debug->unclaimed_mmio_check =0 ; +if (!uncore->debug->suspend_count++) { + uncore->debug->saved_mmio_check = uncore->debug- >unclaimed_mmio_check; + uncore->debug->unclaimed_mmio_check =0 ; } + +spin_unlock (&uncore->debug->lock); } -static void mmio_debug_resume (struct intel_uncore_mmio_debug *mmio_debug) +static bool check_for_unclaimed_mmio (struct intel_uncore *uncore); + +static void mmio_debug_resume (struct intel_uncore *uncore) { -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock); + +if (!--uncore->debug->suspend_count) + uncore->debug->unclaimed_mmio_check = uncore->debug- >saved_mmio_check; -if (!--mmio_debug->suspend_count) - mmio_debug->unclaimed_mmio_check = mmio_debug-Quoted 1 line
saved_mmio_check;drivers/gpu/drm/i915/intel_uncore.c +5
-0+if (check_for_unclaimed_mmio (uncore)) +drm_info (&uncore->i915->drm, +"Invalid mmio detected during user access\n" ); + +spin_unlock (&uncore->debug->lock);}
static const char * const forcewake_domain_names[] = {
drivers/gpu/drm/i915/intel_uncore.c +1
-3@@ -677,9 +687,7 @@ void intel_uncore_forcewake_user_get(struct intel_uncore *uncore) spin_lock_irq(&uncore->lock);if (!uncore->user_forcewake_count++) {intel_uncore_forcewake_get__locked (uncore,FORCEWAKE_ALL ); -spin_lock (&uncore->debug->lock); -mmio_debug_suspend (uncore->debug); -spin_unlock (&uncore->debug->lock); +mmio_debug_suspend (uncore); }spin_unlock_irq(&uncore->lock); }drivers/gpu/drm/i915/intel_uncore.c +1
-8@@ -695,14 +703,7 @@ void intel_uncore_forcewake_user_put(struct intel_uncore *uncore) {spin_lock_irq (&uncore->lock);if (!--uncore->user_forcewake_count) { -spin_lock (&uncore->debug->lock); -mmio_debug_resume (uncore->debug); - -if (check_for_unclaimed_mmio (uncore)) -drm_info (&uncore->i915->drm, -"Invalid mmio detected during user access\n"); -spin_unlock (&uncore->debug->lock); - + mmio_debug_resume(uncore); intel_uncore_forcewake_put__locked(uncore,FORCEWAKE_ALL); } spin_unlock_irq(&uncore->lock);--
2.37.2
Signature · 4 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation
RE: [PATCH v2 01/12] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}
Quoted 56 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, September 6, 2022 1:09 PM
To: Ruhl, Michael J <[email protected]>
Cc: [email protected]; [email protected]; Sripada, Radhakrishna <[email protected]>
Subject: Re: [PATCH v2 01/12] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}Quoted 8 lines · Michael J
Quoted 8 lines
-----Original Message-----
From: dri-devel <[email protected]> On Behalf Of Matt Roper
Sent: Friday, September 2, 2022 7:33 PM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>
Subject: [PATCH v2 01/12] drm/i915: Move locking and unclaimed checkinto
Quoted 29 lines
Quoted 19 lines
mmio_debug_{suspend, resume}
Moving the locking for MMIO debug (and the final check for unclaimed accesses when resuming debug after a userspace-initiated forcewake) will make it simpler to completely skip MMIO debug handling on uncores that don't support it in future patches.
Signed-off-by Matt Roper <[email protected]>Reviewed-by Radhakrishna Sripada <[email protected]>---
drivers/gpu/drm/i915/intel_uncore.c| 41 +++++++++++++++--------------1 file changed, 21 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/intel_uncore.c +0
-0drivers/gpu/drm/i915/intel_uncore.c intel_uncore_mmio_debug_init_early(struct · line 55
Quoted 7 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -50,23 +50,33 @@ intel_uncore_mmio_debug_init_early(struct intel_uncore_mmio_debug *mmio_debug) mmio_debug->unclaimed_mmio_check = 1; } -static void mmio_debug_suspend (struct intel_uncore_mmio_debug *mmio_debug) +static void mmio_debug_suspend (struct intel_uncore *uncore)/bike-shedding...
Quoted 7 lines
It seems like there has been a tend to name functions with the
_unlockedpostfix when the lock is being taken within the function.
Would this be a reasonable name update for these changes?
Quoted 10 lines
I think
foo_unlocked()naming is usually used when there's also a separatefoo()that can be called if/when locks are already held (or sometimes it'sfoo()andfoo_locked()if the situation is the other way around). In this case we still only have one version of the function, and it's only called from a single place in the code (intel_uncore_forcewake_user_get) so I don't think the special naming is necessary. It might actually add confusion here since there's a different lock (the general uncore lock) that is still held by the caller. It's just the mmio_debug-specific lock that's been moved into the mmio-debug specific function here.
Got it. That makes sense.
Thanks,
Mike
Quoted 89 lines
Matt
Quoted 71 lines
M
Quoted 68 lines
drivers/gpu/drm/i915/intel_uncore.c +13
-8{ -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock);/* Save and disable mmio debugging for the user bypass */ -if (!mmio_debug->suspend_count++) { - mmio_debug->saved_mmio_check = mmio_debug- >unclaimed_mmio_check; - mmio_debug->unclaimed_mmio_check =0 ; +if (!uncore->debug->suspend_count++) { + uncore->debug->saved_mmio_check = uncore->debug- >unclaimed_mmio_check; + uncore->debug->unclaimed_mmio_check =0 ; } + +spin_unlock (&uncore->debug->lock); } -static void mmio_debug_resume (struct intel_uncore_mmio_debug *mmio_debug) +static bool check_for_unclaimed_mmio (struct intel_uncore *uncore); + +static void mmio_debug_resume (struct intel_uncore *uncore) { -lockdep_assert_held (&mmio_debug->lock); +spin_lock (&uncore->debug->lock); + +if (!--uncore->debug->suspend_count) + uncore->debug->unclaimed_mmio_check = uncore->debug- >saved_mmio_check; -if (!--mmio_debug->suspend_count) - mmio_debug->unclaimed_mmio_check = mmio_debug-Quoted 1 line
saved_mmio_check;drivers/gpu/drm/i915/intel_uncore.c +5
-0+if (check_for_unclaimed_mmio (uncore)) +drm_info (&uncore->i915->drm, +"Invalid mmio detected during user access\n" ); + +spin_unlock (&uncore->debug->lock);}
static const char * const forcewake_domain_names[] = {
drivers/gpu/drm/i915/intel_uncore.c +1
-3@@ -677,9 +687,7 @@ void intel_uncore_forcewake_user_get(struct intel_uncore *uncore) spin_lock_irq(&uncore->lock);if (!uncore->user_forcewake_count++) {intel_uncore_forcewake_get__locked (uncore,FORCEWAKE_ALL ); -spin_lock (&uncore->debug->lock); -mmio_debug_suspend (uncore->debug); -spin_unlock (&uncore->debug->lock); +mmio_debug_suspend (uncore); }spin_unlock_irq(&uncore->lock); }drivers/gpu/drm/i915/intel_uncore.c +0
-7@@ -695,14 +703,7 @@ void intel_uncore_forcewake_user_put(struct intel_uncore *uncore) {spin_lock_irq (&uncore->lock);if (!--uncore->user_forcewake_count) { -spin_lock (&uncore->debug->lock); -mmio_debug_resume (uncore->debug); - -if (check_for_unclaimed_mmio (uncore)) -drm_info (&uncore->i915->drm, -"Invalid mmio detected during user access\n"); -spin_unlock (&uncore->debug->lock);Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1- +mmio_debug_resume (uncore); intel_uncore_forcewake_put__locked(uncore,FORCEWAKE_ALL); } spin_unlock_irq(&uncore->lock);--
2.37.2--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
PATCH v2 2/12 drm/i915: Only hook up uncore->debug for primary uncore
In reply to Matt RoperThe original intent of intel_uncore_mmio_debug as described in commit 0a9b26306d6a ("drm/i915: split out uncore_mmio_debug") was to be a singleton structure that could be shared between multiple GTs' uncore objects in a multi-tile system. Somehow we went off track and started allocating separate instances of this structure for each GT, which defeats that original goal.
But in reality, there isn't even a need to share the mmio_debug between multiple GTs; on all modern platforms (i.e., everything after gen7) unclaimed register accesses are something that can only be detected for display registers. There's no point in grabbing the debug spinlock and checking for unclaimed accesses on an uncore used by an xehpsdv or pvc remote tile GT, or the uncore used by a mtl standalone media GT since all of the display accesses go through the primary intel_uncore.
The simplest solution is to simply leave uncore->debug NULL on all intel_uncore instances except for the primary one. This will allow us to avoid the pointless debug spinlock acquisition we've been doing on MMIO accesses coming in through these intel_uncores.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 9 --------- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 23 ++++++++++++++++++----- drivers/gpu/drm/i915/intel_uncore.h | 3 +-- 4 files changed, 20 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +0 -9
@@ -781,21 +781,13 @@ static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr)int ret;if (!gt_is_root (gt)) { -struct intel_uncore_mmio_debug *mmio_debug;struct intel_uncore *uncore; uncore =kzalloc (sizeof (*uncore),GFP_KERNEL );if (!uncore)return -ENOMEM ; - mmio_debug =kzalloc (sizeof (*mmio_debug),GFP_KERNEL ); -if (!mmio_debug) { -kfree (uncore); -return -ENOMEM ; - } - gt->uncore = uncore; - gt->uncore->debug = mmio_debug;__intel_gt_init_early (gt); }
@@ -817,7 +809,6 @@ intel_gt_tile_cleanup(struct intel_gt *gt)intel_uncore_cleanup_mmio (gt->uncore);if (!gt_is_root (gt)) { -kfree (gt->uncore->debug);kfree (gt->uncore);kfree (gt); }
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -326,7 +326,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_device_info_subplatform_init (dev_priv);intel_step_init (dev_priv); -intel_uncore_mmio_debug_init_early (&dev_priv->mmio_debug); +intel_uncore_mmio_debug_init_early (dev_priv);spin_lock_init (&dev_priv->irq_lock);spin_lock_init (&dev_priv->gpu_error.lock);
drivers/gpu/drm/i915/intel_uncore.c +18 -5
@@ -44,14 +44,19 @@ fw_domains_get(struct intel_uncore *uncore, enum forcewake_domains fw_domains) }void -intel_uncore_mmio_debug_init_early (struct intel_uncore_mmio_debug *mmio_debug) +intel_uncore_mmio_debug_init_early (struct drm_i915_private *i915) { -spin_lock_init (&mmio_debug->lock); - mmio_debug->unclaimed_mmio_check =1 ; +spin_lock_init (&i915->mmio_debug.lock); + i915->mmio_debug.unclaimed_mmio_check =1 ; + + i915->uncore.debug = &i915->mmio_debug; }static void mmio_debug_suspend (struct intel_uncore *uncore) { +if (!uncore->debug) +return ; +spin_lock (&uncore->debug->lock);/* Save and disable mmio debugging for the user bypass */
@@ -67,6 +72,9 @@ static bool check_for_unclaimed_mmio(struct intel_uncore *uncore);static void mmio_debug_resume (struct intel_uncore *uncore) { +if (!uncore->debug) +return ; +spin_lock (&uncore->debug->lock);if (!--uncore->debug->suspend_count)
@@ -1705,7 +1713,7 @@ unclaimed_reg_debug(struct intel_uncore *uncore, const bool read, const bool before) { - if (likely(!uncore->i915->params.mmio_debug)) + if (likely(!uncore->i915->params.mmio_debug) || !uncore->debug) return;/* interrupts are disabled and re-enabled around uncore->lock usage */
@@ -2267,7 +2275,6 @@ void intel_uncore_init_early(struct intel_uncore *uncore, uncore->i915 = gt->i915; uncore->gt = gt; uncore->rpm = >->i915->runtime_pm; - uncore->debug = >->i915->mmio_debug; }static void uncore_raw_init (struct intel_uncore *uncore)
@@ -2578,6 +2585,9 @@ bool intel_uncore_unclaimed_mmio(struct intel_uncore *uncore) {bool ret; +if (!uncore->debug) +return false; +spin_lock_irq (&uncore->debug->lock); ret =check_for_unclaimed_mmio (uncore);spin_unlock_irq (&uncore->debug->lock);
@@ -2590,6 +2600,9 @@ intel_uncore_arm_unclaimed_mmio_detection(struct intel_uncore *uncore) {bool ret = false; +if (drm_WARN_ON (&uncore->i915->drm, !uncore->debug)) +return false; +spin_lock_irq (&uncore->debug->lock);if (unlikely (uncore->debug->unclaimed_mmio_check <=0 ))
drivers/gpu/drm/i915/intel_uncore.h +1 -2
@@ -210,8 +210,7 @@ intel_uncore_has_fifo(const struct intel_uncore *uncore)return uncore->flags &UNCORE_HAS_FIFO ; } -void -intel_uncore_mmio_debug_init_early (struct intel_uncore_mmio_debug *mmio_debug); +void intel_uncore_mmio_debug_init_early (struct drm_i915_private *i915);void intel_uncore_init_early (struct intel_uncore *uncore,struct intel_gt *gt);int intel_uncore_setup_mmio (struct intel_uncore *uncore,phys_addr_t phys_addr);
Signature · 1 line
2.37.2
PATCH v2 3/12 drm/i915: Use managed allocations for extra uncore objects
In reply to Matt RoperWe're slowly transitioning the init-time kzalloc's of the driver over to DRM-managed allocations; let's make sure the uncore objects allocated for non-root GTs are thus allocated.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +2 -4
@@ -783,7 +783,7 @@ static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr)if (!gt_is_root (gt)) {struct intel_uncore *uncore; - uncore =kzalloc (sizeof (*uncore),GFP_KERNEL ); + uncore =drmm_kzalloc (>->i915->drm,sizeof (*uncore),GFP_KERNEL );if (!uncore)return -ENOMEM ;
@@ -808,10 +808,8 @@ intel_gt_tile_cleanup(struct intel_gt *gt) {intel_uncore_cleanup_mmio (gt->uncore); -if (!gt_is_root (gt)) { -kfree (gt->uncore); +if (!gt_is_root (gt))kfree (gt); - } }int intel_gt_probe_all (struct drm_i915_private *i915)
Signature · 1 line
2.37.2
PATCH v2 4/12 drm/i915: Prepare more multi-GT initialization
In reply to Matt RoperWe're going to introduce an additional intel_gt for MTL's media unit soon. Let's provide a bit more multi-GT initialization framework in preparation for that. The initialization will pull the list of GTs for a platform from the device info structure. Although necessary for the immediate MTL media enabling, this same framework will also be used farther down the road when we enable remote tiles on xehpsdv and pvc.
v2:
- Re-add missing test for !HAS_EXTRA_GT_LIST in intel_gt_probe_all().
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 51 +++++++++++++++++-- drivers/gpu/drm/i915/gt/intel_gt.h | 1 - drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/intel_device_info.h | 16 ++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 1 + 7 files changed, 70 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -1
@@ -736,7 +736,7 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)u16 vdbox_mask;u16 vebox_mask; - info->engine_mask =RUNTIME_INFO (i915)->platform_engine_mask; +GEM_BUG_ON (!info->engine_mask);if (GRAPHICS_VER (i915) <11 )return info->engine_mask;
drivers/gpu/drm/i915/gt/intel_gt.c +47 -4
78 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gt.h +0 -1
@@ -54,7 +54,6 @@ void intel_gt_driver_register(struct intel_gt *gt);void intel_gt_driver_unregister (struct intel_gt *gt);void intel_gt_driver_remove (struct intel_gt *gt);void intel_gt_driver_release (struct intel_gt *gt); -void intel_gt_driver_late_release_all (struct drm_i915_private *i915);int intel_gt_wait_for_idle (struct intel_gt *gt,long timeout);
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
@@ -83,6 +83,9 @@ struct gt_defaults {struct intel_gt {struct drm_i915_private *i915; +const char *name; +enum intel_gt_type type; +struct intel_uncore *uncore;struct i915_ggtt *ggtt;
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -918,6 +918,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_REGION (i915, i) (RUNTIME_INFO(i915)->memory_regions & (i))#define HAS_LMEM (i915) HAS_REGION(i915, REGION_LMEM) +#define HAS_EXTRA_GT_LIST (dev_priv) (INTEL_INFO(dev_priv)->extra_gt_list) +/* * Platform has the dedicated compression control state for each lmem surfaces * stored in lmem to support the 3D and media compression formats.
drivers/gpu/drm/i915/intel_device_info.h +16 -0
@@ -245,6 +245,20 @@ struct intel_runtime_info { }; }; +enum intel_gt_type { +GT_PRIMARY , +GT_TILE , +}; + +struct intel_gt_definition { +enum intel_gt_type type; +char *name; +int (*setup)(struct intel_gt *gt, +phys_addr_t phys_addr); +u32 mapping_base; +intel_engine_mask_t engine_mask; +}; +struct intel_device_info {struct ip_version media;
@@ -252,6 +266,8 @@ struct intel_device_info {unsigned int dma_mask_size;/* available DMA address bits */ +const struct intel_gt_definition *extra_gt_list; +u8 gt;/* GT number, 0 if undefined */ #define DEFINE_FLAG (name) u8 name:1
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -0
@@ -115,6 +115,7 @@ static struct dev_pm_domain pm_domain = {static void mock_gt_probe (struct drm_i915_private *i915) { i915->gt[0 ] = &i915->gt0; + i915->gt[0 ]->name ="Mock GT" ; }struct drm_i915_private *mock_gem_device (void )
Signature · 1 line
2.37.2
PATCH v2 5/12 drm/i915: Rename and expose common GT early init routine
In reply to Matt RoperThe common early GT init is needed for initialization of all GT types (root/primary, remote tile, standalone media). Since standalone media (coming in the next patch) will be implemented in a separate file, rename and expose the function for use.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 6 +++--- drivers/gpu/drm/i915/gt/intel_gt.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +3 -3
@@ -35,7 +35,7 @@#include "intel_uncore.h" #include "shmem_utils.h" -static void __intel_gt_init_early (struct intel_gt *gt) +void intel_gt_common_init_early (struct intel_gt *gt) {spin_lock_init (>->irq_lock);
@@ -65,7 +65,7 @@ void intel_root_gt_init_early(struct drm_i915_private *i915) gt->i915 = i915; gt->uncore = &i915->uncore; -__intel_gt_init_early (gt); +intel_gt_common_init_early (gt); }static int intel_gt_probe_lmem (struct intel_gt *gt)
@@ -789,7 +789,7 @@ static int intel_gt_tile_setup(struct intel_gt *gt, phys_addr_t phys_addr) gt->uncore = uncore; -__intel_gt_init_early (gt); +intel_gt_common_init_early (gt); }intel_uncore_init_early (gt->uncore, gt);
drivers/gpu/drm/i915/gt/intel_gt.h +1 -0
@@ -44,6 +44,7 @@ static inline struct intel_gt *gsc_to_gt(struct intel_gsc *gsc) return container_of(gsc, struct intel_gt, gsc); } +void intel_gt_common_init_early (struct intel_gt *gt);void intel_root_gt_init_early (struct drm_i915_private *i915);int intel_gt_assign_ggtt (struct intel_gt *gt);int intel_gt_init_mmio (struct intel_gt *gt);
Signature · 1 line
2.37.2
PATCH v2 6/12 drm/i915: Use a DRM-managed action to release the PCI bridge device
In reply to Matt RoperAs we start supporting multiple uncore structures in future patches, the MMIO cleanup (which make also get called mid-init if there's a failure) will become more complicated. Moving to DRM-managed actions will help keep things simple.
--- drivers/gpu/drm/i915/i915_driver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +9 -3
@@ -105,6 +105,12 @@ static const char irst_name[] = "INT3392";static const struct drm_driver i915_drm_driver; +static void i915_release_bridge_dev (struct drm_device *dev, +void *bridge) +{ +pci_dev_put (bridge); +} +static int i915_get_bridge_dev (struct drm_i915_private *dev_priv) {int domain =pci_domain_nr (to_pci_dev (dev_priv->drm.dev)->bus);
@@ -115,7 +121,9 @@ static int i915_get_bridge_dev(struct drm_i915_private *dev_priv)drm_err (&dev_priv->drm,"bridge device not found\n" );return -EIO ; } -return 0 ; + +return drmm_add_action_or_reset (&dev_priv->drm, i915_release_bridge_dev, + dev_priv->bridge_dev); }/* Allocate space for the MCH regs if needed, return nonzero on error */
@@ -452,7 +460,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); -pci_dev_put (dev_priv->bridge_dev);return ret; }
@@ -465,7 +472,6 @@ static void i915_driver_mmio_release(struct drm_i915_private *dev_priv) {intel_teardown_mchbar (dev_priv);intel_uncore_fini_mmio (&dev_priv->uncore); -pci_dev_put (dev_priv->bridge_dev); }/**
Signature · 1 line
2.37.2
PATCH v2 7/12 drm/i915: Initialize MMIO access for each GT
In reply to Matt RoperIn a multi-GT system we need to initialize MMIO access for each GT, not just the primary GT.
--- 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(-)
drivers/gpu/drm/i915/i915_driver.c +18 -9
@@ -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); }/**
drivers/gpu/drm/i915/intel_uncore.c +4 -1
@@ -2454,8 +2454,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(
drivers/gpu/drm/i915/intel_uncore.h +2 -1
@@ -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);
Signature · 1 line
2.37.2
PATCH v2 8/12 drm/i915: Handle each GT on init/release and suspend/resume
In reply to Matt RoperIn preparation for enabling a second GT, there are a number of GT/uncore operations that happen during initialization or suspend flows that need to be performed on each GT, not just the primary,
--- drivers/gpu/drm/i915/i915_driver.c | 59 +++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +42 -17
@@ -310,8 +310,13 @@ static void intel_detect_preproduction_hw(struct drm_i915_private *dev_priv)static void sanitize_gpu (struct drm_i915_private *i915) { -if (!INTEL_INFO (i915)->gpu_reset_clobbers_display) -__intel_gt_reset (to_gt (i915),ALL_ENGINES ); +if (!INTEL_INFO (i915)->gpu_reset_clobbers_display) { +struct intel_gt *gt; +unsigned int i; + +for_each_gt (gt, i915, i) +__intel_gt_reset (gt,ALL_ENGINES ); + } }/**
@@ -730,6 +735,8 @@ static void i915_driver_hw_remove(struct drm_i915_private *dev_priv)static void i915_driver_register (struct drm_i915_private *dev_priv) {struct drm_device *dev = &dev_priv->drm; +struct intel_gt *gt; +unsigned int i;i915_gem_driver_register (dev_priv);i915_pmu_register (dev_priv);
@@ -749,7 +756,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)/* Depends on sysfs having been initialized */ i915_perf_register (dev_priv); -intel_gt_driver_register (to_gt (dev_priv)); +for_each_gt (gt, dev_priv, i) +intel_gt_driver_register (gt);intel_display_driver_register (dev_priv);
@@ -768,6 +776,9 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)*/ static void i915_driver_unregister (struct drm_i915_private *dev_priv) { +struct intel_gt *gt; +unsigned int i; +i915_switcheroo_unregister (dev_priv);intel_unregister_dsm_handler ();
@@ -777,7 +788,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)intel_display_driver_unregister (dev_priv); -intel_gt_driver_unregister (to_gt (dev_priv)); +for_each_gt (gt, dev_priv, i) +intel_gt_driver_unregister (gt);i915_perf_unregister (dev_priv);i915_pmu_unregister (dev_priv);
@@ -799,6 +811,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv) {if (drm_debug_enabled (DRM_UT_DRIVER )) {struct drm_printer p =drm_debug_printer ("i915 device info:" ); +struct intel_gt *gt; +unsigned int i; drm_printf(&p, "pciid=0x%04x rev=0x%02x platform=%s (subplatform=0x%x) gen=%i\n", INTEL_DEVID(dev_priv),
@@ -811,7 +825,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)intel_device_info_print (INTEL_INFO (dev_priv),RUNTIME_INFO (dev_priv), &p);i915_print_iommu_status (dev_priv, &p); -intel_gt_info_print (&to_gt (dev_priv)->info, &p); +for_each_gt (gt, dev_priv, i) +intel_gt_info_print (>->info, &p); }if (IS_ENABLED (CONFIG_DRM_I915_DEBUG ))
@@ -1230,13 +1245,15 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev);struct intel_runtime_pm *rpm = &dev_priv->runtime_pm; -int ret; +struct intel_gt *gt; +int ret, i;disable_rpm_wakeref_asserts (rpm);i915_gem_suspend_late (dev_priv); -intel_uncore_suspend (&dev_priv->uncore); +for_each_gt (gt, dev_priv, i) +intel_uncore_suspend (gt->uncore);intel_power_domains_suspend (dev_priv,get_suspend_mode (dev_priv, hibernation));
@@ -1368,7 +1385,8 @@ static int i915_drm_resume_early(struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);struct pci_dev *pdev =to_pci_dev (dev_priv->drm.dev); -int ret; +struct intel_gt *gt; +int ret, i;/* * We have a resume ordering issue with the snd-hda driver also
@@ -1422,9 +1440,10 @@ static int i915_drm_resume_early(struct drm_device *dev)drm_err (&dev_priv->drm,"Resume prepare failed: %d, continuing anyway\n" , ret); -intel_uncore_resume_early (&dev_priv->uncore); - -intel_gt_check_and_clear_faults (to_gt (dev_priv)); +for_each_gt (gt, dev_priv, i) { +intel_uncore_resume_early (gt->uncore); +intel_gt_check_and_clear_faults (gt); + }intel_display_power_resume_early (dev_priv);
@@ -1604,7 +1623,8 @@ static int intel_runtime_suspend(struct device *kdev) {struct drm_i915_private *dev_priv =kdev_to_i915 (kdev);struct intel_runtime_pm *rpm = &dev_priv->runtime_pm; -int ret; +struct intel_gt *gt; +int ret, i;if (drm_WARN_ON_ONCE (&dev_priv->drm, !HAS_RUNTIME_PM (dev_priv)))return -ENODEV ;
@@ -1619,11 +1639,13 @@ static int intel_runtime_suspend(struct device *kdev)*/ i915_gem_runtime_suspend (dev_priv); -intel_gt_runtime_suspend (to_gt (dev_priv)); +for_each_gt (gt, dev_priv, i) +intel_gt_runtime_suspend (gt);intel_runtime_pm_disable_interrupts (dev_priv); -intel_uncore_suspend (&dev_priv->uncore); +for_each_gt (gt, dev_priv, i) +intel_uncore_suspend (gt->uncore);intel_display_power_suspend (dev_priv);
@@ -1687,7 +1709,8 @@ static int intel_runtime_resume(struct device *kdev) {struct drm_i915_private *dev_priv =kdev_to_i915 (kdev);struct intel_runtime_pm *rpm = &dev_priv->runtime_pm; -int ret; +struct intel_gt *gt; +int ret, i;if (drm_WARN_ON_ONCE (&dev_priv->drm, !HAS_RUNTIME_PM (dev_priv)))return -ENODEV ;
@@ -1707,7 +1730,8 @@ static int intel_runtime_resume(struct device *kdev) ret =vlv_resume_prepare (dev_priv, true); -intel_uncore_runtime_resume (&dev_priv->uncore); +for_each_gt (gt, dev_priv, i) +intel_uncore_runtime_resume (gt->uncore);intel_runtime_pm_enable_interrupts (dev_priv);
@@ -1715,7 +1739,8 @@ static int intel_runtime_resume(struct device *kdev)* No point of rolling back things in case of an error, as the best * we can do is to hope that things will still work (and disable RPM). */ -intel_gt_runtime_resume (to_gt (dev_priv)); +for_each_gt (gt, dev_priv, i) +intel_gt_runtime_resume (gt);/* * On VLV/CHV display interrupts are part of the display
Signature · 1 line
2.37.2
PATCH v2 9/12 drm/i915/uncore: Add GSI offset to uncore
In reply to Matt RoperGT non-engine registers (referred to as "GSI" registers by the spec) have the same relative offsets on standalone media as they do on the primary GT, just with an additional "GSI offset" added to their MMIO address. If we store this GSI offset in the standalone media's intel_uncore structure, it can be automatically applied to all GSI reg reads/writes that happen on that GT, allowing us to re-use our existing GT code with minimal changes.
Forcewake and shadowed register tables for the media GT (which will be added in a future patch) are listed as final addresses that already include the GSI offset, so we also need to add the GSI offset before doing lookups of registers in one of those tables.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 17 ++++++++++++++--- drivers/gpu/drm/i915/intel_device_info.h | 4 +++- drivers/gpu/drm/i915/intel_uncore.c | 10 ++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 22 ++++++++++++++++++++-- 4 files changed, 45 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +14 -3
@@ -776,10 +776,20 @@ void intel_gt_driver_late_release_all(struct drm_i915_private *i915) } } -static int intel_gt_tile_setup (struct intel_gt *gt,phys_addr_t phys_addr) +/* +* Note: the gsi_offset parameter here isn't used, but we want to keep the +* function signature equivalent to gtdef->setup() so that it can be plugged +* in when we enabled remote tiles in the future. +*/ +static int intel_gt_tile_setup (struct intel_gt *gt, +phys_addr_t phys_addr, +u32 gsi_offset) {int ret; +/* GSI offset is only applicable for media GTs */ +drm_WARN_ON (>->i915->drm, gsi_offset); +if (!gt_is_root (gt)) {struct intel_uncore *uncore;
@@ -832,7 +842,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->info.engine_mask =RUNTIME_INFO (i915)->platform_engine_mask;drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); - ret =intel_gt_tile_setup (gt, phys_addr); + ret =intel_gt_tile_setup (gt, phys_addr,0 );if (ret)return ret;
@@ -865,7 +875,8 @@ int intel_gt_probe_all(struct drm_i915_private *i915) goto err; } - ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base); + ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base, + gtdef->gsi_offset);if (ret) goto err;
drivers/gpu/drm/i915/intel_device_info.h +3 -1
@@ -254,8 +254,10 @@ struct intel_gt_definition {enum intel_gt_type type;char *name;int (*setup)(struct intel_gt *gt, -phys_addr_t phys_addr); +phys_addr_t phys_addr, +u32 gsi_offset);u32 mapping_base; +u32 gsi_offset;intel_engine_mask_t engine_mask; };
drivers/gpu/drm/i915/intel_uncore.c +8 -2
@@ -927,6 +927,9 @@ find_fw_domain(struct intel_uncore *uncore, u32 offset) {const struct intel_forcewake_range *entry; +if (IS_GSI_REG (offset)) + offset += uncore->gsi_offset; + entry = BSEARCH(offset, uncore->fw_domains_table, uncore->fw_domains_table_entries,
@@ -1142,6 +1145,9 @@ static bool is_shadowed(struct intel_uncore *uncore, u32 offset)if (drm_WARN_ON (&uncore->i915->drm, !uncore->shadowed_reg_table))return false; +if (IS_GSI_REG (offset)) + offset += uncore->gsi_offset; + return BSEARCH(offset, uncore->shadowed_reg_table, uncore->shadowed_reg_table_entries,
@@ -1994,8 +2000,8 @@ static int __fw_domain_init(struct intel_uncore *uncore, d->uncore = uncore; d->wake_count =0 ; - d->reg_set = uncore->regs +i915_mmio_reg_offset (reg_set); - d->reg_ack = uncore->regs +i915_mmio_reg_offset (reg_ack); + d->reg_set = uncore->regs +i915_mmio_reg_offset (reg_set) + uncore->gsi_offset; + d->reg_ack = uncore->regs +i915_mmio_reg_offset (reg_ack) + uncore->gsi_offset; d->id = domain_id;
drivers/gpu/drm/i915/intel_uncore.h +20 -2
@@ -136,6 +136,16 @@ struct intel_uncore {spinlock_t lock;/** lock is also taken in irq contexts. */ +/* +* Do we need to apply an additional offset to reach the beginning +* of the basic non-engine GT registers (referred to as "GSI" on +* newer platforms, or "GT block" on older platforms)? If so, we'll +* track that here and apply it transparently to registers in the +* appropriate range to maintain compatibility with our existing +* register definitions and GT code. +*/ +u32 gsi_offset; +unsigned int flags;#define UNCORE_HAS_FORCEWAKE BIT(0)#define UNCORE_HAS_FPGA_DBG_UNCLAIMED BIT(1)
@@ -294,19 +304,27 @@ intel_wait_for_register_fw(struct intel_uncore *uncore, 2, timeout_ms, NULL); } +#define IS_GSI_REG (reg) ((reg) < 0x40000) +/* register access functions */ #define __raw_read (x__, s__) \ static inline u##x__ __raw_uncore_read##x__(const struct intel_uncore *uncore, \ i915_reg_t reg) \ { \ - return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \ + u32 offset = i915_mmio_reg_offset(reg); \ + if (IS_GSI_REG(offset)) \ + offset += uncore->gsi_offset; \ + return read##s__(uncore->regs + offset); \ }#define __raw_write (x__, s__) \ static inline void __raw_uncore_write##x__(const struct intel_uncore *uncore, \ i915_reg_t reg, u##x__ val) \ { \ - write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \ + u32 offset = i915_mmio_reg_offset(reg); \ + if (IS_GSI_REG(offset)) \ + offset += uncore->gsi_offset; \ + write##s__(val, uncore->regs + offset); \ } __raw_read(8, b)__raw_read (16 , w)
Signature · 1 line
2.37.2
Re: [Intel-gfx] [PATCH v2 09/12] drm/i915/uncore: Add GSI offset to uncore
Quoted 159 lines · Matt Roper
GT non-engine registers (referred to as "GSI" registers by the spec) have the same relative offsets on standalone media as they do on the primary GT, just with an additional "GSI offset" added to their MMIO address. If we store this GSI offset in the standalone media's
intel_uncorestructure, it can be automatically applied to all GSI reg reads/writes that happen on that GT, allowing us to re-use our existing GT code with minimal changes.Forcewake and shadowed register tables for the media GT (which will be added in a future patch) are listed as final addresses that already include the GSI offset, so we also need to add the GSI offset before doing lookups of registers in one of those tables.
Cc Daniele Ceraolo Spurio <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt.c | 17 ++++++++++++++--- drivers/gpu/drm/i915/intel_device_info.h | 4 +++- drivers/gpu/drm/i915/intel_uncore.c | 10 ++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 22 ++++++++++++++++++++-- 4 files changed, 45 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/gt/intel_gt.c +14
-3@@ -776,10 +776,20 @@ void intel_gt_driver_late_release_all(struct drm_i915_private *i915) } } -static int intel_gt_tile_setup (struct intel_gt *gt,phys_addr_t phys_addr) +/* +* Note: the gsi_offset parameter here isn't used, but we want to keep the +* function signature equivalent to gtdef->setup() so that it can be plugged +* in when we enabled remote tiles in the future. +*/ +static int intel_gt_tile_setup (struct intel_gt *gt, +phys_addr_t phys_addr, +u32 gsi_offset) {int ret; +/* GSI offset is only applicable for media GTs */ +drm_WARN_ON (>->i915->drm, gsi_offset); +if (!gt_is_root (gt)) {struct intel_uncore *uncore;@@ -832,7 +842,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->info.engine_mask =RUNTIME_INFO (i915)->platform_engine_mask;drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); - ret =intel_gt_tile_setup (gt, phys_addr); + ret =intel_gt_tile_setup (gt, phys_addr,0 );if (ret)return ret;@@ -865,7 +875,8 @@ int intel_gt_probe_all(struct drm_i915_private *i915) goto err; } - ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base); + ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base, + gtdef->gsi_offset);if (ret) goto err;drivers/gpu/drm/i915/intel_device_info.h +3
-1@@ -254,8 +254,10 @@ struct intel_gt_definition {enum intel_gt_type type;char *name;int (*setup)(struct intel_gt *gt, -phys_addr_t phys_addr); +phys_addr_t phys_addr, +u32 gsi_offset);u32 mapping_base; +u32 gsi_offset;intel_engine_mask_t engine_mask; };drivers/gpu/drm/i915/intel_uncore.c +8
-2@@ -927,6 +927,9 @@ find_fw_domain(struct intel_uncore *uncore, u32 offset) {const struct intel_forcewake_range *entry; +if (IS_GSI_REG (offset)) + offset += uncore->gsi_offset; + entry = BSEARCH(offset, uncore->fw_domains_table, uncore->fw_domains_table_entries,@@ -1142,6 +1145,9 @@ static bool is_shadowed(struct intel_uncore *uncore, u32 offset)if (drm_WARN_ON (&uncore->i915->drm, !uncore->shadowed_reg_table))return false; +if (IS_GSI_REG (offset)) + offset += uncore->gsi_offset; + return BSEARCH(offset, uncore->shadowed_reg_table, uncore->shadowed_reg_table_entries,@@ -1994,8 +2000,8 @@ static int __fw_domain_init(struct intel_uncore *uncore, d->uncore = uncore; d->wake_count =0 ; - d->reg_set = uncore->regs +i915_mmio_reg_offset (reg_set); - d->reg_ack = uncore->regs +i915_mmio_reg_offset (reg_ack); + d->reg_set = uncore->regs +i915_mmio_reg_offset (reg_set) + uncore->gsi_offset; + d->reg_ack = uncore->regs +i915_mmio_reg_offset (reg_ack) + uncore->gsi_offset; d->id = domain_id;drivers/gpu/drm/i915/intel_uncore.h +16
-1@@ -136,6 +136,16 @@ struct intel_uncore {spinlock_t lock;/** lock is also taken in irq contexts. */ +/* +* Do we need to apply an additional offset to reach the beginning +* of the basic non-engine GT registers (referred to as "GSI" on +* newer platforms, or "GT block" on older platforms)? If so, we'll +* track that here and apply it transparently to registers in the +* appropriate range to maintain compatibility with our existing +* register definitions and GT code. +*/ +u32 gsi_offset; +unsigned int flags;#define UNCORE_HAS_FORCEWAKE BIT(0)#define UNCORE_HAS_FPGA_DBG_UNCLAIMED BIT(1)@@ -294,19 +304,27 @@ intel_wait_for_register_fw(struct intel_uncore *uncore, 2, timeout_ms, NULL); } +#define IS_GSI_REG (reg) ((reg) < 0x40000) +/* register access functions */ #define __raw_read (x__, s__) \ static inline u##x__ __raw_uncore_read##x__(const struct intel_uncore *uncore, \ i915_reg_t reg) \ { \ - return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \ + u32 offset = i915_mmio_reg_offset(reg); \ + if (IS_GSI_REG(offset)) \ + offset += uncore->gsi_offset; \ + return read##s__(uncore->regs + offset); \ }#define __raw_write (x__, s__) \ static inline void __raw_uncore_write##x__(const struct intel_uncore *uncore, \
drivers/gpu/drm/i915/intel_uncore.h intel_wait_for_register_fw(struct intel_uncore *uncore, · line 330
Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.h +4
-1i915_reg_t reg, u##x__ val) \ { \ - write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \ + u32 offset = i915_mmio_reg_offset(reg); \ + if (IS_GSI_REG(offset)) \ + offset += uncore->gsi_offset; \ + write##s__(val, uncore->regs + offset); \ } __raw_read(8, b)__raw_read (16 , w)
Looks like the gsi_offset shall be added in gen12_emit_flush_xcs for aux_inv case as well.
Thanks,
Aravind.
Re: [Intel-gfx] [PATCH v2 09/12] drm/i915/uncore: Add GSI offset to uncore
Quoted 160 lines · Aravind
Quoted 157 lines · Matt Roper
GT non-engine registers (referred to as "GSI" registers by the spec) have the same relative offsets on standalone media as they do on the primary GT, just with an additional "GSI offset" added to their MMIO address. If we store this GSI offset in the standalone media's
intel_uncorestructure, it can be automatically applied to all GSI reg reads/writes that happen on that GT, allowing us to re-use our existing GT code with minimal changes.Forcewake and shadowed register tables for the media GT (which will be added in a future patch) are listed as final addresses that already include the GSI offset, so we also need to add the GSI offset before doing lookups of registers in one of those tables.
Cc Daniele Ceraolo Spurio <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt.c | 17 ++++++++++++++--- drivers/gpu/drm/i915/intel_device_info.h | 4 +++- drivers/gpu/drm/i915/intel_uncore.c | 10 ++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 22 ++++++++++++++++++++-- 4 files changed, 45 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/gt/intel_gt.c +14
-3@@ -776,10 +776,20 @@ void intel_gt_driver_late_release_all(struct drm_i915_private *i915) } } -static int intel_gt_tile_setup (struct intel_gt *gt,phys_addr_t phys_addr) +/* +* Note: the gsi_offset parameter here isn't used, but we want to keep the +* function signature equivalent to gtdef->setup() so that it can be plugged +* in when we enabled remote tiles in the future. +*/ +static int intel_gt_tile_setup (struct intel_gt *gt, +phys_addr_t phys_addr, +u32 gsi_offset) {int ret; +/* GSI offset is only applicable for media GTs */ +drm_WARN_ON (>->i915->drm, gsi_offset); +if (!gt_is_root (gt)) {struct intel_uncore *uncore;@@ -832,7 +842,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->info.engine_mask =RUNTIME_INFO (i915)->platform_engine_mask;drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); - ret =intel_gt_tile_setup (gt, phys_addr); + ret =intel_gt_tile_setup (gt, phys_addr,0 );if (ret)return ret;@@ -865,7 +875,8 @@ int intel_gt_probe_all(struct drm_i915_private *i915) goto err; } - ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base); + ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base, + gtdef->gsi_offset);if (ret) goto err;drivers/gpu/drm/i915/intel_device_info.h +3
-1@@ -254,8 +254,10 @@ struct intel_gt_definition {enum intel_gt_type type;char *name;int (*setup)(struct intel_gt *gt, -phys_addr_t phys_addr); +phys_addr_t phys_addr, +u32 gsi_offset);u32 mapping_base; +u32 gsi_offset;intel_engine_mask_t engine_mask; };drivers/gpu/drm/i915/intel_uncore.c +8
-2@@ -927,6 +927,9 @@ find_fw_domain(struct intel_uncore *uncore, u32 offset) {const struct intel_forcewake_range *entry; +if (IS_GSI_REG (offset)) + offset += uncore->gsi_offset; + entry = BSEARCH(offset, uncore->fw_domains_table, uncore->fw_domains_table_entries,@@ -1142,6 +1145,9 @@ static bool is_shadowed(struct intel_uncore *uncore, u32 offset)if (drm_WARN_ON (&uncore->i915->drm, !uncore->shadowed_reg_table))return false; +if (IS_GSI_REG (offset)) + offset += uncore->gsi_offset; + return BSEARCH(offset, uncore->shadowed_reg_table, uncore->shadowed_reg_table_entries,@@ -1994,8 +2000,8 @@ static int __fw_domain_init(struct intel_uncore *uncore, d->uncore = uncore; d->wake_count =0 ; - d->reg_set = uncore->regs +i915_mmio_reg_offset (reg_set); - d->reg_ack = uncore->regs +i915_mmio_reg_offset (reg_ack); + d->reg_set = uncore->regs +i915_mmio_reg_offset (reg_set) + uncore->gsi_offset; + d->reg_ack = uncore->regs +i915_mmio_reg_offset (reg_ack) + uncore->gsi_offset; d->id = domain_id;drivers/gpu/drm/i915/intel_uncore.h +16
-1@@ -136,6 +136,16 @@ struct intel_uncore {spinlock_t lock;/** lock is also taken in irq contexts. */ +/* +* Do we need to apply an additional offset to reach the beginning +* of the basic non-engine GT registers (referred to as "GSI" on +* newer platforms, or "GT block" on older platforms)? If so, we'll +* track that here and apply it transparently to registers in the +* appropriate range to maintain compatibility with our existing +* register definitions and GT code. +*/ +u32 gsi_offset; +unsigned int flags;#define UNCORE_HAS_FORCEWAKE BIT(0)#define UNCORE_HAS_FPGA_DBG_UNCLAIMED BIT(1)@@ -294,19 +304,27 @@ intel_wait_for_register_fw(struct intel_uncore *uncore, 2, timeout_ms, NULL); } +#define IS_GSI_REG (reg) ((reg) < 0x40000) +/* register access functions */ #define __raw_read (x__, s__) \ static inline u##x__ __raw_uncore_read##x__(const struct intel_uncore *uncore, \ i915_reg_t reg) \ { \ - return read##s__(uncore->regs + i915_mmio_reg_offset(reg)); \ + u32 offset = i915_mmio_reg_offset(reg); \ + if (IS_GSI_REG(offset)) \ + offset += uncore->gsi_offset; \ + return read##s__(uncore->regs + offset); \ }
Quoted 15 lines
drivers/gpu/drm/i915/intel_uncore.h intel_wait_for_register_fw(struct intel_uncore *uncore, · line 330
Quoted 12 lines
drivers/gpu/drm/i915/intel_uncore.h +4
-1#define __raw_write (x__, s__) \ static inline void __raw_uncore_write##x__(const struct intel_uncore *uncore, \ i915_reg_t reg, u##x__ val) \ { \ - write##s__(val, uncore->regs + i915_mmio_reg_offset(reg)); \ + u32 offset = i915_mmio_reg_offset(reg); \ + if (IS_GSI_REG(offset)) \ + offset += uncore->gsi_offset; \ + write##s__(val, uncore->regs + offset); \ } __raw_read(8, b)__raw_read (16 , w)Looks like the
gsi_offsetshall be added ingen12_emit_flush_xcsforaux_invcase as well.
Good catch. I'll address that in the next version, but I think I'll do so as a separate patch with a dedicated commit message.
Matt
Quoted 3 lines
Thanks,
Aravind.
Signature · 4 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation
PATCH v2 10/12 drm/i915/xelpmp: Expose media as another GT
In reply to Matt RoperXe_LPM+ platforms have "standalone media." I.e., the media unit is designed as an additional GT with its own engine list, GuC, forcewake, etc. Let's allow platforms to include media GTs in their device info.
v2:
- Simplify GSI register handling and split it out to a separate patch for ease of review. (Daniele)
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 8 +++++ drivers/gpu/drm/i915/gt/intel_sa_media.c | 39 ++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_sa_media.h | 15 +++++++++ drivers/gpu/drm/i915/i915_pci.c | 15 +++++++++ drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_uncore.c | 4 +++ 7 files changed, 83 insertions(+) create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.c create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -123,6 +123,7 @@ gt-y += \ gt/intel_ring.o \ gt/intel_ring_submission.o \ gt/intel_rps.o \ + gt/intel_sa_media.o \ gt/intel_sseu.o \ gt/intel_sseu_debugfs.o \ gt/intel_timeline.o \
drivers/gpu/drm/i915/gt/intel_gt_regs.h +8 -0
@@ -1578,4 +1578,12 @@#define GEN12_SFC_DONE (n) _MMIO(0x1cc000 + (n) * 0x1000) +/* +* Standalone Media's non-engine GT registers are located at their regular GT +* offsets plus 0x380000. This extra offset is stored inside the intel_uncore +* structure so that the existing code can be used for both GTs without +* modification. +*/ +#define MTL_MEDIA_GSI_BASE 0x380000 +#endif /* __INTEL_GT_REGS__ */
drivers/gpu/drm/i915/gt/intel_sa_media.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2021 Intel Corporation +*/ + +#include <drm/drm_managed.h> + +#include "i915_drv.h" +#include "gt/intel_gt.h" +#include "gt/intel_sa_media.h" + +int intel_sa_mediagt_setup (struct intel_gt *gt,phys_addr_t phys_addr, +u32 gsi_offset) +{ +struct drm_i915_private *i915 = gt->i915; +struct intel_uncore *uncore; + + uncore =drmm_kzalloc (&i915->drm,sizeof (*uncore),GFP_KERNEL ); +if (!uncore) +return -ENOMEM ; + + uncore->gsi_offset = gsi_offset; + +intel_gt_common_init_early (gt); +intel_uncore_init_early (uncore, gt); + +/* +* Standalone media shares the general MMIO space with the primary +* GT. We'll re-use the primary GT's mapping. +*/ + uncore->regs = i915->uncore.regs; +if (drm_WARN_ON (&i915->drm, uncore->regs ==NULL )) +return -EIO ; + + gt->uncore = uncore; + gt->phys_addr = phys_addr; + +return 0 ; +}
drivers/gpu/drm/i915/gt/intel_sa_media.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ +#ifndef __INTEL_SA_MEDIA__ +#define __INTEL_SA_MEDIA__ + +#include <linux/types.h> + +struct intel_gt ; + +int intel_sa_mediagt_setup (struct intel_gt *gt,phys_addr_t phys_addr, +u32 gsi_offset); + +#endif /* __INTEL_SA_MEDIA_H__ */
drivers/gpu/drm/i915/i915_pci.c +15 -0
@@ -26,6 +26,9 @@#include <drm/drm_drv.h> #include <drm/i915_pciids.h> +#include "gt/intel_gt_regs.h" +#include "gt/intel_sa_media.h" +#include "i915_driver.h" #include "i915_drv.h" #include "i915_pci.h"
@@ -1115,6 +1118,17 @@ static const struct intel_device_info pvc_info = { .display.has_cdclk_crawl = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A) | BIT(INTEL_FBC_B) +static const struct intel_gt_definition xelpmp_extra_gt[] = { + { + .type =GT_MEDIA , + .name ="Standalone Media GT" , + .setup = intel_sa_mediagt_setup, + .gsi_offset =MTL_MEDIA_GSI_BASE , + .engine_mask =BIT (VECS0 ) |BIT (VCS0 ) |BIT (VCS2 ), + }, + {} +}; +__maybe_unused static const struct intel_device_info mtl_info = {XE_HP_FEATURES ,
@@ -1128,6 +1142,7 @@ static const struct intel_device_info mtl_info = { .media.ver = 13,PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, + .extra_gt_list = xelpmp_extra_gt, .has_flat_ccs = 0, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -248,6 +248,7 @@ struct intel_runtime_info {enum intel_gt_type {GT_PRIMARY ,GT_TILE , +GT_MEDIA , };struct intel_gt_definition {
drivers/gpu/drm/i915/intel_uncore.c +4 -0
@@ -2271,6 +2271,10 @@ int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr)void intel_uncore_cleanup_mmio (struct intel_uncore *uncore) { +/* The media GT re-uses the primary GT's register mapping */ +if (uncore->gt->type ==GT_MEDIA ) +return ; +iounmap (uncore->regs); }
Signature · 1 line
2.37.2
Re: [PATCH v2 10/12] drm/i915/xelpmp: Expose media as another GT
Quoted 175 lines · Matt Roper
Xe_LPM+ platforms have "standalone media." I.e., the media unit is designed as an additional GT with its own engine list, GuC, forcewake, etc. Let's allow platforms to include media GTs in their device info.
v2:
- Simplify GSI register handling and split it out to a separate patch for ease of review. (Daniele)Cc Aravind Iddamsetty <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 8 +++++ drivers/gpu/drm/i915/gt/intel_sa_media.c | 39 ++++++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_sa_media.h | 15 +++++++++ drivers/gpu/drm/i915/i915_pci.c | 15 +++++++++ drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_uncore.c | 4 +++ 7 files changed, 83 insertions(+) create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.c create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -123,6 +123,7 @@ gt-y += \ gt/intel_ring.o \ gt/intel_ring_submission.o \ gt/intel_rps.o \ + gt/intel_sa_media.o \ gt/intel_sseu.o \ gt/intel_sseu_debugfs.o \ gt/intel_timeline.o \drivers/gpu/drm/i915/gt/intel_gt_regs.h +8
-0@@ -1578,4 +1578,12 @@#define GEN12_SFC_DONE (n) _MMIO(0x1cc000 + (n) * 0x1000) +/* +* Standalone Media's non-engine GT registers are located at their regular GT +* offsets plus 0x380000. This extra offset is stored inside the intel_uncore +* structure so that the existing code can be used for both GTs without +* modification. +*/ +#define MTL_MEDIA_GSI_BASE 0x380000 +#endif /* __INTEL_GT_REGS__ */ drivers/gpu/drm/i915/gt/intel_sa_media.c new file +39
-0@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2021 Intel Corporation +*/ + +#include <drm/drm_managed.h> + +#include "i915_drv.h" +#include "gt/intel_gt.h" +#include "gt/intel_sa_media.h" + +int intel_sa_mediagt_setup (struct intel_gt *gt,phys_addr_t phys_addr, +u32 gsi_offset) +{ +struct drm_i915_private *i915 = gt->i915; +struct intel_uncore *uncore; + + uncore =drmm_kzalloc (&i915->drm,sizeof (*uncore),GFP_KERNEL ); +if (!uncore) +return -ENOMEM ; + + uncore->gsi_offset = gsi_offset; + +intel_gt_common_init_early (gt); +intel_uncore_init_early (uncore, gt); + +/* +* Standalone media shares the general MMIO space with the primary +* GT. We'll re-use the primary GT's mapping. +*/ + uncore->regs = i915->uncore.regs; +if (drm_WARN_ON (&i915->drm, uncore->regs ==NULL )) +return -EIO ; + + gt->uncore = uncore; + gt->phys_addr = phys_addr; + +return 0 ; +}drivers/gpu/drm/i915/gt/intel_sa_media.h new file +15
-0@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2021 Intel Corporation +*/ +#ifndef __INTEL_SA_MEDIA__ +#define __INTEL_SA_MEDIA__ + +#include <linux/types.h> + +struct intel_gt ; + +int intel_sa_mediagt_setup (struct intel_gt *gt,phys_addr_t phys_addr, +u32 gsi_offset); + +#endif /* __INTEL_SA_MEDIA_H__ */ drivers/gpu/drm/i915/i915_pci.c +15
-0@@ -26,6 +26,9 @@#include <drm/drm_drv.h> #include <drm/i915_pciids.h> +#include "gt/intel_gt_regs.h" +#include "gt/intel_sa_media.h" +#include "i915_driver.h" #include "i915_drv.h" #include "i915_pci.h" @@ -1115,6 +1118,17 @@ static const struct intel_device_info pvc_info = { .display.has_cdclk_crawl = 1, \ .__runtime.fbc_mask = BIT(INTEL_FBC_A) | BIT(INTEL_FBC_B) +static const struct intel_gt_definition xelpmp_extra_gt[] = { + { + .type =GT_MEDIA , + .name ="Standalone Media GT" , + .setup = intel_sa_mediagt_setup, + .gsi_offset =MTL_MEDIA_GSI_BASE , + .engine_mask =BIT (VECS0 ) |BIT (VCS0 ) |BIT (VCS2 ), + }, + {} +}; +__maybe_unused static const struct intel_device_info mtl_info = {XE_HP_FEATURES ,@@ -1128,6 +1142,7 @@ static const struct intel_device_info mtl_info = { .media.ver = 13,PLATFORM (INTEL_METEORLAKE ), .display.has_modular_fia = 1, + .extra_gt_list = xelpmp_extra_gt, .has_flat_ccs = 0, .has_snoop = 1, .__runtime.memory_regions = REGION_SMEM | REGION_STOLEN_LMEM,drivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -248,6 +248,7 @@ struct intel_runtime_info {enum intel_gt_type {GT_PRIMARY ,GT_TILE , +GT_MEDIA , };struct intel_gt_definition {drivers/gpu/drm/i915/intel_uncore.c +0
-0
drivers/gpu/drm/i915/intel_uncore.c int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr) · line 2280
Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +4
-0@@ -2271,6 +2271,10 @@ int intel_uncore_setup_mmio(struct intel_uncore *uncore, phys_addr_t phys_addr)void intel_uncore_cleanup_mmio (struct intel_uncore *uncore) { +/* The media GT re-uses the primary GT's register mapping */ +if (uncore->gt->type ==GT_MEDIA ) +return ; +iounmap (uncore->regs); }
LGTM.
Thanks,
Aravind.
PATCH v2 11/12 drm/i915/mtl: Use primary GT's irq lock for media GT
In reply to Matt RoperWhen we hook up interrupts (in the next patch), interrupts for the media GT are still processed as part of the primary GT's interrupt flow. As such, we should share the same IRQ lock with the primary GT. Let's convert gt->irq_lock into a pointer and just point the media GT's instance at the same lock the primary GT is using.
v2:
- Point media's gt->irq_lock at the primary GT lock properly. (Daniele)
- Fix jump target for intel_root_gt_init_early errors. (Daniele)
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 8 +++--- drivers/gpu/drm/i915/gt/intel_gt.c | 15 +++++++++-- drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 16 ++++++------ drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 8 +++--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 26 +++++++++---------- drivers/gpu/drm/i915/gt/intel_sa_media.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 24 ++++++++--------- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +-- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 +-- drivers/gpu/drm/i915/i915_driver.c | 5 +++- drivers/gpu/drm/i915/i915_irq.c | 4 +-- drivers/gpu/drm/i915/pxp/intel_pxp.c | 4 +-- drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 14 +++++----- drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 4 +-- 16 files changed, 78 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +4 -4
@@ -1688,9 +1688,9 @@ bool intel_engine_irq_enable(struct intel_engine_cs *engine)return false;/* Caller disables interrupts */ -spin_lock (&engine->gt->irq_lock); +spin_lock (engine->gt->irq_lock); engine->irq_enable (engine); -spin_unlock (&engine->gt->irq_lock); +spin_unlock (engine->gt->irq_lock);return true; }
@@ -1701,9 +1701,9 @@ void intel_engine_irq_disable(struct intel_engine_cs *engine)return ;/* Caller disables interrupts */ -spin_lock (&engine->gt->irq_lock); +spin_lock (engine->gt->irq_lock); engine->irq_disable (engine); -spin_unlock (&engine->gt->irq_lock); +spin_unlock (engine->gt->irq_lock); }void intel_engines_reset_default_submission (struct intel_gt *gt)
drivers/gpu/drm/i915/gt/intel_gt.c +13 -2
@@ -37,7 +37,7 @@void intel_gt_common_init_early (struct intel_gt *gt) { -spin_lock_init (>->irq_lock); +spin_lock_init (gt->irq_lock);INIT_LIST_HEAD (>->closed_vma);spin_lock_init (>->closed_lock);
@@ -58,14 +58,19 @@ void intel_gt_common_init_early(struct intel_gt *gt) }/* Preliminary initialization of Tile 0 */ -void intel_root_gt_init_early (struct drm_i915_private *i915) +int intel_root_gt_init_early (struct drm_i915_private *i915) {struct intel_gt *gt =to_gt (i915); gt->i915 = i915; gt->uncore = &i915->uncore; + gt->irq_lock =drmm_kzalloc (&i915->drm,sizeof (*gt->irq_lock),GFP_KERNEL ); +if (!gt->irq_lock) +return -ENOMEM ;intel_gt_common_init_early (gt); + +return 0 ; }static int intel_gt_probe_lmem (struct intel_gt *gt)
@@ -792,12 +797,18 @@ static int intel_gt_tile_setup(struct intel_gt *gt,if (!gt_is_root (gt)) {struct intel_uncore *uncore; +spinlock_t *irq_lock; uncore =drmm_kzalloc (>->i915->drm,sizeof (*uncore),GFP_KERNEL );if (!uncore)return -ENOMEM ; + irq_lock =drmm_kzalloc (>->i915->drm,sizeof (*irq_lock),GFP_KERNEL ); +if (!irq_lock) +return -ENOMEM ; + gt->uncore = uncore; + gt->irq_lock = irq_lock;intel_gt_common_init_early (gt); }
drivers/gpu/drm/i915/gt/intel_gt.h +1 -1
@@ -45,7 +45,7 @@ static inline struct intel_gt *gsc_to_gt(struct intel_gsc *gsc) }void intel_gt_common_init_early (struct intel_gt *gt); -void intel_root_gt_init_early (struct drm_i915_private *i915); +int intel_root_gt_init_early (struct drm_i915_private *i915);int intel_gt_assign_ggtt (struct intel_gt *gt);int intel_gt_init_mmio (struct intel_gt *gt);int __must_check intel_gt_init_hw (struct intel_gt *gt);
drivers/gpu/drm/i915/gt/intel_gt_irq.c +8 -8
@@ -29,7 +29,7 @@ gen11_gt_engine_identity(struct intel_gt *gt,u32 timeout_ts;u32 ident; -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock);raw_reg_write (regs,GEN11_IIR_REG_SELECTOR (bank),BIT (bit));
@@ -120,7 +120,7 @@ gen11_gt_bank_handler(struct intel_gt *gt, const unsigned int bank)unsigned long intr_dw;unsigned int bit; -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock); intr_dw =raw_reg_read (regs,GEN11_GT_INTR_DW (bank));
@@ -138,14 +138,14 @@ void gen11_gt_irq_handler(struct intel_gt *gt, const u32 master_ctl) {unsigned int bank; -spin_lock (>->irq_lock); +spin_lock (gt->irq_lock);for (bank =0 ; bank <2 ; bank++) {if (master_ctl &GEN11_GT_DW_IRQ (bank))gen11_gt_bank_handler (gt, bank); } -spin_unlock (>->irq_lock); +spin_unlock (gt->irq_lock); } bool gen11_gt_reset_one_iir(struct intel_gt *gt,
@@ -154,7 +154,7 @@ bool gen11_gt_reset_one_iir(struct intel_gt *gt,void __iomem *const regs = gt->uncore->regs;u32 dw; -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock); dw =raw_reg_read (regs,GEN11_GT_INTR_DW (bank));if (dw &BIT (bit)) {
@@ -310,9 +310,9 @@ static void gen7_parity_error_irq_handler(struct intel_gt *gt, u32 iir)if (!HAS_L3_DPF (gt->i915))return ; -spin_lock (>->irq_lock); +spin_lock (gt->irq_lock);gen5_gt_disable_irq (gt,GT_PARITY_ERROR (gt->i915)); -spin_unlock (>->irq_lock); +spin_unlock (gt->irq_lock);if (iir >_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 ) gt->i915->l3_parity.which_slice |=1 <<1 ;
@@ -434,7 +434,7 @@ static void gen5_gt_update_irq(struct intel_gt *gt,u32 interrupt_mask, u32 enabled_irq_mask) { -lockdep_assert_held (>->irq_lock); + lockdep_assert_held(gt->irq_lock);GEM_BUG_ON (enabled_irq_mask & ~interrupt_mask);
drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c +4 -4
@@ -37,7 +37,7 @@ static void gen6_gt_pm_update_irq(struct intel_gt *gt,WARN_ON (enabled_irq_mask & ~interrupt_mask); -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock); new_val = gt->pm_imr; new_val &= ~interrupt_mask;
@@ -64,7 +64,7 @@ void gen6_gt_pm_reset_iir(struct intel_gt *gt, u32 reset_mask)struct intel_uncore *uncore = gt->uncore;i915_reg_t reg =GRAPHICS_VER (gt->i915) >=8 ?GEN8_GT_IIR (2 ) :GEN6_PMIIR ; -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock);intel_uncore_write (uncore, reg, reset_mask);intel_uncore_write (uncore, reg, reset_mask);
@@ -92,7 +92,7 @@ static void write_pm_ier(struct intel_gt *gt)void gen6_gt_pm_enable_irq (struct intel_gt *gt,u32 enable_mask) { -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock); gt->pm_ier |= enable_mask;write_pm_ier (gt);
@@ -101,7 +101,7 @@ void gen6_gt_pm_enable_irq(struct intel_gt *gt, u32 enable_mask)void gen6_gt_pm_disable_irq (struct intel_gt *gt,u32 disable_mask) { -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock); gt->pm_ier &= ~disable_mask;gen6_gt_pm_mask_irq (gt, disable_mask);
drivers/gpu/drm/i915/gt/intel_gt_types.h +1 -1
@@ -157,7 +157,7 @@ struct intel_gt {struct intel_rc6 rc6;struct intel_rps rps; -spinlock_t irq_lock; +spinlock_t *irq_lock;u32 gt_imr;u32 pm_ier;u32 pm_imr;
drivers/gpu/drm/i915/gt/intel_rps.c +13 -13
@@ -194,9 +194,9 @@ static void rps_enable_interrupts(struct intel_rps *rps)rps_reset_ei (rps); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen6_gt_pm_enable_irq (gt, rps->pm_events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);intel_uncore_write (gt->uncore,GEN6_PMINTRMSK ,rps_pm_mask (rps, rps->last_freq));
@@ -217,14 +217,14 @@ static void rps_reset_interrupts(struct intel_rps *rps) {struct intel_gt *gt =rps_to_gt (rps); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);if (GRAPHICS_VER (gt->i915) >=11 )gen11_rps_reset_interrupts (rps);else gen6_rps_reset_interrupts (rps); rps->pm_iir =0 ; -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }static void rps_disable_interrupts (struct intel_rps *rps)
@@ -234,9 +234,9 @@ static void rps_disable_interrupts(struct intel_rps *rps)intel_uncore_write (gt->uncore,GEN6_PMINTRMSK ,rps_pm_sanitize_mask (rps, ~0u )); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen6_gt_pm_disable_irq (gt,GEN6_PM_RPS_EVENTS ); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);intel_synchronize_irq (gt->i915);
@@ -1794,10 +1794,10 @@ static void rps_work(struct work_struct *work)int new_freq, adj, min, max;u32 pm_iir =0 ; -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock); pm_iir =fetch_and_zero (&rps->pm_iir) & rps->pm_events; client_boost =atomic_read (&rps->num_waiters); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);/* Make sure we didn't queue anything we're not going to process. */ if (!pm_iir && !client_boost)
@@ -1870,9 +1870,9 @@ static void rps_work(struct work_struct *work)mutex_unlock (&rps->lock); out: -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen6_gt_pm_unmask_irq (gt, rps->pm_events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }void gen11_rps_irq_handler (struct intel_rps *rps,u32 pm_iir)
@@ -1880,7 +1880,7 @@ void gen11_rps_irq_handler(struct intel_rps *rps, u32 pm_iir)struct intel_gt *gt =rps_to_gt (rps);const u32 events = rps->pm_events & pm_iir; -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock);if (unlikely (!events))return ;
@@ -1900,7 +1900,7 @@ void gen6_rps_irq_handler(struct intel_rps *rps, u32 pm_iir) events = pm_iir & rps->pm_events;if (events) { -spin_lock (>->irq_lock); +spin_lock (gt->irq_lock);GT_TRACE (gt,"irq events:%x\n" , events);
@@ -1908,7 +1908,7 @@ void gen6_rps_irq_handler(struct intel_rps *rps, u32 pm_iir) rps->pm_iir |= events;schedule_work (&rps->work); -spin_unlock (>->irq_lock); +spin_unlock (gt->irq_lock); }if (GRAPHICS_VER (gt->i915) >=8 )
drivers/gpu/drm/i915/gt/intel_sa_media.c +1 -0
@@ -21,6 +21,7 @@ int intel_sa_mediagt_setup(struct intel_gt *gt, phys_addr_t phys_addr, uncore->gsi_offset = gsi_offset; + gt->irq_lock =to_gt (i915)->irq_lock;intel_gt_common_init_early (gt);intel_uncore_init_early (uncore, gt);
drivers/gpu/drm/i915/gt/uc/intel_guc.c +12 -12
@@ -82,9 +82,9 @@ static void gen9_reset_guc_interrupts(struct intel_guc *guc)assert_rpm_wakelock_held (>->i915->runtime_pm); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen6_gt_pm_reset_iir (gt, gt->pm_guc_events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }static void gen9_enable_guc_interrupts (struct intel_guc *guc)
@@ -93,11 +93,11 @@ static void gen9_enable_guc_interrupts(struct intel_guc *guc)assert_rpm_wakelock_held (>->i915->runtime_pm); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);WARN_ON_ONCE (intel_uncore_read (gt->uncore,GEN8_GT_IIR (2 )) & gt->pm_guc_events);gen6_gt_pm_enable_irq (gt, gt->pm_guc_events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }static void gen9_disable_guc_interrupts (struct intel_guc *guc)
@@ -106,11 +106,11 @@ static void gen9_disable_guc_interrupts(struct intel_guc *guc)assert_rpm_wakelock_held (>->i915->runtime_pm); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen6_gt_pm_disable_irq (gt, gt->pm_guc_events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);intel_synchronize_irq (gt->i915);gen9_reset_guc_interrupts (guc);
@@ -120,9 +120,9 @@ static void gen11_reset_guc_interrupts(struct intel_guc *guc) {struct intel_gt *gt =guc_to_gt (guc); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen11_gt_reset_one_iir (gt,0 ,GEN11_GUC ); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }static void gen11_enable_guc_interrupts (struct intel_guc *guc)
@@ -130,25 +130,25 @@ static void gen11_enable_guc_interrupts(struct intel_guc *guc)struct intel_gt *gt =guc_to_gt (guc);u32 events =REG_FIELD_PREP (ENGINE1_MASK ,GUC_INTR_GUC2HOST ); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);WARN_ON_ONCE (gen11_gt_reset_one_iir (gt,0 ,GEN11_GUC ));intel_uncore_write (gt->uncore,GEN11_GUC_SG_INTR_ENABLE , events);intel_uncore_write (gt->uncore,GEN11_GUC_SG_INTR_MASK , ~events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }static void gen11_disable_guc_interrupts (struct intel_guc *guc) {struct intel_gt *gt =guc_to_gt (guc); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);intel_uncore_write (gt->uncore,GEN11_GUC_SG_INTR_MASK , ~0 );intel_uncore_write (gt->uncore,GEN11_GUC_SG_INTR_ENABLE ,0 ); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);intel_synchronize_irq (gt->i915);gen11_reset_guc_interrupts (guc);
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2 -2
@@ -1532,8 +1532,8 @@ void intel_guc_submission_reset_prepare(struct intel_guc *guc)__reset_guc_busyness_stats (guc);/* Flush IRQ handler */ -spin_lock_irq (&guc_to_gt (guc)->irq_lock); -spin_unlock_irq (&guc_to_gt (guc)->irq_lock); +spin_lock_irq (guc_to_gt (guc)->irq_lock); +spin_unlock_irq (guc_to_gt (guc)->irq_lock);guc_flush_submissions (guc);guc_flush_destroyed_contexts (guc);
drivers/gpu/drm/i915/gt/uc/intel_uc.c +2 -2
@@ -245,9 +245,9 @@ static int guc_enable_communication(struct intel_guc *guc)intel_guc_enable_interrupts (guc);/* check for CT messages received before we enabled interrupts */ -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);intel_guc_ct_event_handler (&guc->ct); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);drm_dbg (&i915->drm,"GuC communication enabled\n" );
drivers/gpu/drm/i915/i915_driver.c +4 -1
@@ -370,7 +370,9 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_wopcm_init_early (&dev_priv->wopcm); -intel_root_gt_init_early (dev_priv); + ret =intel_root_gt_init_early (dev_priv); +if (ret <0 ) + goto err_rootgt;i915_drm_clients_init (&dev_priv->clients, dev_priv);
@@ -395,6 +397,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)i915_gem_cleanup_early (dev_priv);intel_gt_driver_late_release_all (dev_priv);i915_drm_clients_fini (&dev_priv->clients); +err_rootgt:intel_region_ttm_device_fini (dev_priv); err_ttm:vlv_suspend_cleanup (dev_priv);
drivers/gpu/drm/i915/i915_irq.c +2 -2
@@ -1104,9 +1104,9 @@ static void ivb_parity_work(struct work_struct *work) out:drm_WARN_ON (&dev_priv->drm, dev_priv->l3_parity.which_slice); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen5_gt_enable_irq (gt,GT_PARITY_ERROR (dev_priv)); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);mutex_unlock (&dev_priv->drm.struct_mutex); }
drivers/gpu/drm/i915/pxp/intel_pxp.c +2 -2
@@ -169,11 +169,11 @@ static void pxp_queue_termination(struct intel_pxp *pxp)* We want to get the same effect as if we received a termination * interrupt, so just pretend that we did. */ -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);intel_pxp_mark_termination_in_progress (pxp); pxp->session_events |=PXP_TERMINATION_REQUEST ;queue_work (system_unbound_wq, &pxp->session_work); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }static bool pxp_component_bound (struct intel_pxp *pxp)
drivers/gpu/drm/i915/pxp/intel_pxp_irq.c +7 -7
@@ -25,7 +25,7 @@ void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir)if (GEM_WARN_ON (!intel_pxp_is_enabled (pxp)))return ; -lockdep_assert_held (>->irq_lock); +lockdep_assert_held (gt->irq_lock);if (unlikely (!iir))return ;
@@ -55,16 +55,16 @@ static inline void __pxp_set_interrupts(struct intel_gt *gt, u32 interrupts)static inline void pxp_irq_reset (struct intel_gt *gt) { -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);gen11_gt_reset_one_iir (gt,0 ,GEN11_KCR ); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }void intel_pxp_irq_enable (struct intel_pxp *pxp) {struct intel_gt *gt =pxp_to_gt (pxp); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock);if (!pxp->irq_enabled)WARN_ON_ONCE (gen11_gt_reset_one_iir (gt,0 ,GEN11_KCR ));
@@ -72,7 +72,7 @@ void intel_pxp_irq_enable(struct intel_pxp *pxp)__pxp_set_interrupts (gt,GEN12_PXP_INTERRUPTS ); pxp->irq_enabled = true; -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock); }void intel_pxp_irq_disable (struct intel_pxp *pxp)
@@ -88,12 +88,12 @@ void intel_pxp_irq_disable(struct intel_pxp *pxp)*/ GEM_WARN_ON (intel_pxp_is_active (pxp)); -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock); pxp->irq_enabled = false;__pxp_set_interrupts (gt,0 ); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);intel_synchronize_irq (gt->i915);pxp_irq_reset (gt);
drivers/gpu/drm/i915/pxp/intel_pxp_session.c +2 -2
@@ -144,9 +144,9 @@ void intel_pxp_session_work(struct work_struct *work)intel_wakeref_t wakeref;u32 events =0 ; -spin_lock_irq (>->irq_lock); +spin_lock_irq (gt->irq_lock); events =fetch_and_zero (&pxp->session_events); -spin_unlock_irq (>->irq_lock); +spin_unlock_irq (gt->irq_lock);if (!events)return ;
Signature · 1 line
2.37.2
kernel test robot
build botRe: [PATCH v2 11/12] drm/i915/mtl: Use primary GT's irq lock for media GT
Thank you for the patch! Yet something to improve:
Hi Matt,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
url: https://github.com/intel-lab-lkp/linux/commits/Matt-Roper/i915-Add-standalone-media-support-for-MTL/20220903-073602 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: i386-randconfig-a011 (https://download.01.org/0day-ci/archive/20220903/[email protected]/config) compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/0c50809816566e24ec98f3d90fcc3acb502f58df
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Matt-Roper/i915-Add-standalone-media-support-for-MTL/20220903-073602 git checkout 0c50809816566e24ec98f3d90fcc3acb502f58df
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag where applicable
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c:50:16: error: incompatible pointer types passing 'spinlock_t **' (aka 'struct spinlock **') to parameter of type 'spinlock_t *' (aka 'struct spinlock *'); remove & [-Werror,-Wincompatible-pointer-types]
spin_lock_irq(>->irq_lock);
^~~~~~~~~~~~~
include/linux/spinlock.h:372:55: note: passing argument to parameter 'lock' here
static __always_inline void spin_lock_irq(spinlock_t *lock)
^
drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c:52:18: error: incompatible pointer types passing 'spinlock_t **' (aka 'struct spinlock **') to parameter of type 'spinlock_t *' (aka 'struct spinlock *'); remove & [-Werror,-Wincompatible-pointer-types]
spin_unlock_irq(>->irq_lock);
^~~~~~~~~~~~~
include/linux/spinlock.h:397:57: note: passing argument to parameter 'lock' here
static __always_inline void spin_unlock_irq(spinlock_t *lock)
^2 errors generated.
vim +50 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 40
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 41 static int pxp_terminate_set(void *data, u64 val)
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 42 {
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 43 struct intel_pxp *pxp = data;
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 44 struct intel_gt *gt = pxp_to_gt(pxp);
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 45
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 46 if (!intel_pxp_is_active(pxp))
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 47 return -ENODEV;
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 48
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 49 /* simulate a termination interrupt */
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 @50 spin_lock_irq(>->irq_lock);
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 51 intel_pxp_irq_handler(pxp, GEN12_DISPLAY_PXP_STATE_TERMINATED_INTERRUPT);
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 52 spin_unlock_irq(>->irq_lock);
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 53
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 54 if (!wait_for_completion_timeout(&pxp->termination,
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 55 msecs_to_jiffies(100)))
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 56 return -ETIMEDOUT;
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 57
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 58 return 0;
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 59 }
390cf1b28b1119 Daniele Ceraolo Spurio 2021-09-24 60 Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
PATCH v2 12/12 drm/i915/mtl: Hook up interrupts for standalone media
In reply to Matt RoperTop-level handling of standalone media interrupts will be processed as part of the primary GT's interrupt handler (since primary and media GTs share an MMIO space, unlike remote tile setups). When we get down to the point of handling engine interrupts, we need to take care to lookup VCS and VECS engines in the media GT rather than the primary.
There are also a couple of additional "other" instance bits that correspond to the media GT's GuC and media GT's power management interrupts; we need to direct those to the media GT instance as well.
Bspec: 45605
--- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 19 +++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 ++ drivers/gpu/drm/i915/gt/intel_sa_media.c | 7 +++++++ drivers/gpu/drm/i915/i915_drv.h | 3 +++ 4 files changed, 31 insertions(+)
drivers/gpu/drm/i915/gt/intel_gt_irq.c +19 -0
@@ -59,11 +59,17 @@ static void gen11_other_irq_handler(struct intel_gt *gt, const u8 instance, const u16 iir) { + struct intel_gt *media_gt = gt->i915->media_gt; +if (instance ==OTHER_GUC_INSTANCE )return guc_irq_handler (>->uc.guc, iir); +if (instance ==OTHER_MEDIA_GUC_INSTANCE && media_gt) +return guc_irq_handler (&media_gt->uc.guc, iir);if (instance ==OTHER_GTPM_INSTANCE )return gen11_rps_irq_handler (>->rps, iir); +if (instance ==OTHER_MEDIA_GTPM_INSTANCE && media_gt) +return gen11_rps_irq_handler (&media_gt->rps, iir);if (instance ==OTHER_KCR_INSTANCE )return intel_pxp_irq_handler (>->pxp, iir);
@@ -81,6 +87,18 @@ gen11_engine_irq_handler(struct intel_gt *gt, const u8 class, {struct intel_engine_cs *engine; +/* +* Platforms with standalone media have their media engines in another +* GT. +*/ +if (MEDIA_VER (gt->i915) >=13 && + (class ==VIDEO_DECODE_CLASS || class ==VIDEO_ENHANCEMENT_CLASS )) { +if (!gt->i915->media_gt) + goto err; + + gt = gt->i915->media_gt; + } +if (instance <=MAX_ENGINE_INSTANCE ) engine = gt->engine_class[class][instance];else
@@ -89,6 +107,7 @@ gen11_engine_irq_handler(struct intel_gt *gt, const u8 class,if (likely (engine))return intel_engine_cs_irq (engine, iir); +err:WARN_ONCE (1 ,"unhandled engine interrupt class=0x%x, instance=0x%x\n" , class, instance); }
drivers/gpu/drm/i915/gt/intel_gt_regs.h +2 -0
@@ -1554,6 +1554,8 @@#define OTHER_GTPM_INSTANCE 1#define OTHER_KCR_INSTANCE 4#define OTHER_GSC_INSTANCE 6 +#define OTHER_MEDIA_GUC_INSTANCE 16 +#define OTHER_MEDIA_GTPM_INSTANCE 17#define GEN11_IIR_REG_SELECTOR (x) _MMIO(0x190070 + ((x) * 4))
drivers/gpu/drm/i915/gt/intel_sa_media.c +7 -0
@@ -36,5 +36,12 @@ int intel_sa_mediagt_setup(struct intel_gt *gt, phys_addr_t phys_addr, gt->uncore = uncore; gt->phys_addr = phys_addr; +/* +* For current platforms we can assume there's only a single +* media GT and cache it for quick lookup. +*/ +drm_WARN_ON (&i915->drm, i915->media_gt); + i915->media_gt = gt; +return 0 ; }
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -365,6 +365,9 @@ struct drm_i915_private {struct kobject *sysfs_gt; +/* Quick lookup of media GT (current platforms only have one) */ +struct intel_gt *media_gt; + struct { struct i915_gem_contexts { spinlock_t lock; /* locks list */
Signature · 1 line
2.37.2
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for i915: Add "standalone media" support for MTL (rev3)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev3)
URL : https://patchwork.freedesktop.org/series/107908/
State : warning
== Summary ==
Error: dim checkpatch failed37274f1f4068 drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume} a54ec2ba43d9 drm/i915: Only hook up uncore->debug for primary uncore 884dc9b22c7f drm/i915: Use managed allocations for extra uncore objects bc55b5f78d81 drm/i915: Prepare more multi-GT initialization
-:77: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "gtdef->setup" #77: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:845:
+ gtdef->setup != NULL;
total: 0 errors, 0 warnings, 1 checks, 145 lines checked42e3ef15239e drm/i915: Rename and expose common GT early init routine c89bcd0f475f drm/i915: Use a DRM-managed action to release the PCI bridge device 92209b602b0a drm/i915: Initialize MMIO access for each GT305fc9377923 drm/i915: Handle each GT on init/release and suspend/resume 48cc0a18886f drm/i915/uncore: Add GSI offset to uncorec7a1db1bf375 drm/i915/xelpmp: Expose media as another GT
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 11, in <module>
import git
ModuleNotFoundError: No module named 'git'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 11, in <module>
import git
ModuleNotFoundError: No module named 'git'
-:48: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #48:
new file mode 100644
-:84: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!uncore->regs" #84: FILE: drivers/gpu/drm/i915/gt/intel_sa_media.c:32:
+ if (drm_WARN_ON(&i915->drm, uncore->regs == NULL))
total: 0 errors, 1 warnings, 1 checks, 123 lines checked ac9f18358457 drm/i915/mtl: Use primary GT's irq lock for media GT -:85: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #85: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:800:
+ spinlock_t *irq_lock;
-:231: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #231: FILE: drivers/gpu/drm/i915/gt/intel_gt_types.h:160:
+ spinlock_t *irq_lock;
total: 0 errors, 0 warnings, 2 checks, 466 lines checked dd8286e593bd drm/i915/mtl: Hook up interrupts for standalone media
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for i915: Add "standalone media" support for MTL (rev3)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev3)
URL : https://patchwork.freedesktop.org/series/107908/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for i915: Add "standalone media" support for MTL (rev3)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev3)
URL : https://patchwork.freedesktop.org/series/107908/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12067 -> Patchwork_107908v3
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/index.html
Participating hosts (32 -> 31)
------------------------------
Additional (1): fi-hsw-4770
Missing (2): fi-bdw-samus bat-dg1-5
Known issues
------------
Here are the changes found in Patchwork_107908v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_backlight@basic-brightness:
- fi-hsw-4770: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#3012])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-hsw-4770/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: NOTRUN -> [INCOMPLETE][2] ([i915#4785])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-hsw-4770/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@requests:
- fi-pnv-d510: [PASS][3] -> [DMESG-FAIL][4] ([i915#4528])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/fi-pnv-d510/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-pnv-d510/igt@i915_selftest@[email protected]
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- fi-hsw-4770: NOTRUN -> [SKIP][5] ([fdo#109271]) +9 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-hsw-4770/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-hsw-4770: NOTRUN -> [SKIP][6] ([fdo#109271] / [fdo#111827]) +7 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-hsw-4770/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- fi-hsw-4770: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#1072]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-hsw-4770/igt@kms_psr@sprite_plane_onoff.html
* igt@runner@aborted:
- fi-hsw-4770: NOTRUN -> [FAIL][8] ([fdo#109271] / [i915#4312] / [i915#5594] / [i915#6246])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-hsw-4770/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][9] ([i915#4312])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/fi-bdw-5557u/igt@[email protected]
#### Possible fixes ####
* igt@gem_ringfill@basic-all:
- {bat-dg2-9}: [FAIL][10] ([i915#5886]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/bat-dg2-9/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/bat-dg2-9/igt@[email protected]
* igt@i915_selftest@live@slpc:
- {bat-rpls-1}: [DMESG-FAIL][12] ([i915#6367]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/bat-rpls-1/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/bat-rpls-1/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#5153]: https://gitlab.freedesktop.org/drm/intel/issues/5153
[i915#5594]: https://gitlab.freedesktop.org/drm/intel/issues/5594
[i915#5886]: https://gitlab.freedesktop.org/drm/intel/issues/5886
[i915#6246]: https://gitlab.freedesktop.org/drm/intel/issues/6246
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599
Build changes
-------------
* Linux: CI_DRM_12067 -> Patchwork_107908v3
CI-20190529: 20190529
CI_DRM_12067: d7a4dd8aada1f62a680ecded0719199619eff752 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6642: c018ce1d1ab8e570f665cf5d58c9802a44d66cc1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107908v3: d7a4dd8aada1f62a680ecded0719199619eff752 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
308aa8b1d304 drm/i915/mtl: Hook up interrupts for standalone media 4cac5575f2bc drm/i915/mtl: Use primary GT's irq lock for media GT cddc3f349bc5 drm/i915/xelpmp: Expose media as another GTf316b954e654 drm/i915/uncore: Add GSI offset to uncoreecb0b5a34858 drm/i915: Handle each GT on init/release and suspend/resume a886b813d2f9 drm/i915: Initialize MMIO access for each GTab77ed31a249 drm/i915: Use a DRM-managed action to release the PCI bridge device 63e191586224 drm/i915: Rename and expose common GT early init routine a4dd0ccebf13 drm/i915: Prepare more multi-GT initialization9f829bc810d2 drm/i915: Use managed allocations for extra uncore objects a6bb3ed221ef drm/i915: Only hook up uncore->debug for primary uncore 1795009d6e97 drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for i915: Add "standalone media" support for MTL (rev3)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev3)
URL : https://patchwork.freedesktop.org/series/107908/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12067_full -> Patchwork_107908v3_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_107908v3_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_107908v3_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (10 -> 12)
------------------------------
Additional (2): shard-rkl shard-tglu
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_107908v3_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_module_load@reload-with-fault-injection:
- shard-snb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-snb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-snb4/igt@[email protected]
- shard-apl: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-apl1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl6/igt@[email protected]
- shard-iclb: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb8/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_cursor_crc@cursor-random-32x32}:
- {shard-tglu}: NOTRUN -> [SKIP][7] +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-tglu-6/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_107908v3_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@kms:
- shard-tglb: [PASS][8] -> [FAIL][9] ([i915#5784])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-tglb7/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-tglb3/igt@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-iclb: [PASS][10] -> [TIMEOUT][11] ([i915#3070])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb2/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb6/igt@[email protected]
* igt@gem_exec_balancer@parallel-contexts:
- shard-iclb: [PASS][12] -> [SKIP][13] ([i915#4525])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb1/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb7/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][14] ([i915#4991])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl1/igt@[email protected]
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [PASS][15] -> [DMESG-WARN][16] ([i915#180]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-apl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl3/igt@[email protected]
* igt@kms_ccs@pipe-b-random-ccs-data-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#3886])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl1/igt@kms_ccs@pipe-b-random-ccs-data-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@vga-hpd:
- shard-apl: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111827]) +4 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl6/igt@[email protected]
* igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][19] ([i915#3555])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-linear-to-32bpp-linear-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-32bpp-yftile-upscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][20] ([i915#2672]) +10 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-yftile-to-32bpp-yftile-upscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][21] ([i915#2672] / [i915#3555]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb1/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode.html
* igt@kms_plane_scaling@planes-downscale-factor-0-5@pipe-a-edp-1:
- shard-iclb: [PASS][22] -> [SKIP][23] ([i915#5235]) +5 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb1/igt@kms_plane_scaling@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@kms_plane_scaling@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][24] -> [SKIP][25] ([fdo#109441]) +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb1/igt@kms_psr@psr2_no_drrs.html
* igt@perf@polling-parameterized:
- shard-tglb: [PASS][26] -> [FAIL][27] ([i915#5639])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-tglb2/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-tglb6/igt@[email protected]
* igt@prime_nv_pcopy@test3_4:
- shard-apl: NOTRUN -> [SKIP][28] ([fdo#109271]) +51 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl7/igt@prime_nv_pcopy@test3_4.html
* igt@sysfs_clients@pidname:
- shard-apl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#2994])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl1/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-tglb: [FAIL][30] ([i915#2842]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-tglb2/igt@gem_exec_fair@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-tglb1/igt@gem_exec_fair@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][32] ([i915#2190]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-tglb6/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-tglb3/igt@[email protected]
* igt@gem_workarounds@suspend-resume:
- shard-apl: [DMESG-WARN][34] ([i915#180]) -> [PASS][35] +2 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-apl6/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-apl6/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- shard-iclb: [SKIP][36] ([i915#4281]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb3/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb7/igt@[email protected]
* igt@kms_psr2_su@page_flip-xrgb8888:
- shard-iclb: [SKIP][38] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb1/igt@kms_psr2_su@page_flip-xrgb8888.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@kms_psr2_su@page_flip-xrgb8888.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][40] ([fdo#109441]) -> [PASS][41] +2 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb1/igt@kms_psr@psr2_primary_mmap_cpu.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
#### Warnings ####
* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-iclb: [SKIP][42] ([i915#2920]) -> [SKIP][43] ([fdo#111068] / [i915#658])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb2/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb1/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-iclb: [SKIP][44] ([fdo#111068] / [i915#658]) -> [SKIP][45] ([i915#2920])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb5/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb:
- shard-iclb: [SKIP][46] ([i915#2920]) -> [SKIP][47] ([i915#658])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb2/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb6/igt@[email protected]
* igt@kms_psr2_su@page_flip-p010:
- shard-iclb: [SKIP][48] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [FAIL][49] ([i915#5939])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12067/shard-iclb1/igt@kms_psr2_su@page_flip-p010.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/shard-iclb2/igt@kms_psr2_su@page_flip-p010.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111314]: https://bugs.freedesktop.org/show_bug.cgi?id=111314
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1063]: https://gitlab.freedesktop.org/drm/intel/issues/1063
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3070]: https://gitlab.freedesktop.org/drm/intel/issues/3070
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3376]: https://gitlab.freedesktop.org/drm/intel/issues/3376
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3826]: https://gitlab.freedesktop.org/drm/intel/issues/3826
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4369]: https://gitlab.freedesktop.org/drm/intel/issues/4369
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5287]: https://gitlab.freedesktop.org/drm/intel/issues/5287
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5639]: https://gitlab.freedesktop.org/drm/intel/issues/5639
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#5939]: https://gitlab.freedesktop.org/drm/intel/issues/5939
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
Build changes
-------------
* Linux: CI_DRM_12067 -> Patchwork_107908v3
CI-20190529: 20190529
CI_DRM_12067: d7a4dd8aada1f62a680ecded0719199619eff752 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6642: c018ce1d1ab8e570f665cf5d58c9802a44d66cc1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107908v3: d7a4dd8aada1f62a680ecded0719199619eff752 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v3/index.html