i915: Add "standalone media" support for MTL
Subsystems (2)
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.
Matt Roper (8):
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/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 | 88 ++++++++++++++----- 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 | 6 +- 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 | 80 +++++++++++------ drivers/gpu/drm/i915/intel_uncore.h | 23 ++++- 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, 340 insertions(+), 116 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 1/8 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 1/8] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend,resume}
Quoted 12 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Monday, August 29, 2022 10:03 AM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>; Roper, Matthew D <[email protected]>
Subject: [PATCH 1/8] drm/i915: Move locking and unclaimed check into mmio_debug_{suspend,resume}
Quoted 5 lines
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.
LGTM,
Quoted 93 lines
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/intel_uncore.c | 41 +++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/intel_uncore.c +14
-9@@ -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-Quoted 1 line
saved_mmio_check;drivers/gpu/drm/i915/intel_uncore.c +6
-3+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); }drivers/gpu/drm/i915/intel_uncore.c +1
-8spin_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 );drivers/gpu/drm/i915/intel_uncore.c +0
-1}spin_unlock_irq (&uncore->lock); --2.37.2
PATCH 2/8 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
RE: [PATCH 2/8] drm/i915: Only hook up uncore->debug for primary uncore
Hi Matt,
Quoted 24 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Monday, August 29, 2022 10:03 AM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>; Roper, Matthew D <[email protected]>
Subject: [PATCH 2/8] drm/i915: Only hook upuncore->debugfor primary uncoreThe original intent of
intel_uncore_mmio_debugas described in commit0a9b26306d6a("drm/i915: split outuncore_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_debugbetween 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 primaryintel_uncore.
Quoted 5 lines
The simplest solution is to simply leave
uncore->debugNULL on allintel_uncoreinstances 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 theseintel_uncores.
Quoted 160 lines
Signed-off-by Matt Roper <[email protected]>--- 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
-8@@ -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);drivers/gpu/drm/i915/gt/intel_gt.c +0
-1}@@ -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);drivers/gpu/drm/i915/i915_driver.c +0
-0spin_lock_init (&dev_priv->gpu_error.lock);drivers/gpu/drm/i915/intel_uncore.c +8
-3@@ -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);drivers/gpu/drm/i915/intel_uncore.c +3
-0/* 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);drivers/gpu/drm/i915/intel_uncore.c +1
-2if (!--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)drivers/gpu/drm/i915/intel_uncore.c +3
-0@@ -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);drivers/gpu/drm/i915/intel_uncore.c +3
-0spin_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);drivers/gpu/drm/i915/intel_uncore.c +0
-0if (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(structintel_uncore*uncore,phys_addr_tphys_addr);
--
2.37.2
PATCH 3/8 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
RE: [PATCH 3/8] drm/i915: Use managed allocations for extra uncore objects
Quoted 12 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Monday, August 29, 2022 10:03 AM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>; Roper, Matthew D <[email protected]>
Subject: [PATCH 3/8] drm/i915: Use managed allocations for extra uncore objects
Quoted 4 lines
We'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.
- RK Sripada
Quoted 35 lines
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/gt/intel_gt.c +1
-1@@ -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)drivers/gpu/drm/i915/gt/intel_gt.c +1
-4return -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) --2.37.2
PATCH 4/8 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.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 48 +++++++++++++++++-- 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, 67 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 +44 -4
75 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
@@ -1061,6 +1061,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
@@ -244,6 +244,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;
@@ -251,6 +265,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 4/8 drm/i915: Prepare more multi-GT initialization
We'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
@@ -1061,6 +1061,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
@@ -244,6 +244,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;
@@ -251,6 +265,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
RE: [PATCH 4/8] drm/i915: Prepare more multi-GT initialization
In reply to Matt RoperQuoted 12 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Monday, August 29, 2022 10:03 AM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>; Roper, Matthew D <[email protected]>; Iddamsetty, Aravind <[email protected]>
Subject: [PATCH 4/8] drm/i915: Prepare more multi-GT initialization
Quoted 8 lines
We're going to introduce an additional
intel_gtfor 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.Cc Aravind Iddamsetty <[email protected]>
LGTM.
- RK Sripada
Quoted 203 lines
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 48 +++++++++++++++++-- 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, 67 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 )drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0return info->engine_mask;drivers/gpu/drm/i915/gt/intel_gt.c +2
-3@@ -807,17 +807,16 @@ static void intel_gt_tile_cleanup(struct intel_gt *gt) {intel_uncore_cleanup_mmio (gt->uncore); - -if (!gt_is_root (gt)) -kfree (gt); }int intel_gt_probe_all (struct drm_i915_private *i915) {struct pci_dev *pdev =to_pci_dev (i915->drm.dev);struct intel_gt *gt = &i915->gt0; +const struct intel_gt_definition *gtdef;phys_addr_t phys_addr;unsigned int mmio_bar; +unsigned int i;int ret; mmio_bar = GRAPHICS_VER(i915) == 2 ? GEN2_GTTMMADR_BAR :
GTTMMADR_BAR;drivers/gpu/drm/i915/gt/intel_gt.c +42
-1@@ -828,14 +827,55 @@ int intel_gt_probe_all(struct drm_i915_private *i915)* and it has been already initialized early during probe * in i915_driver_probe() */ + gt->i915 = i915; + gt->name ="Primary GT" ; + 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);if (ret)return ret; i915->gt[0 ] = gt; -/* TODO: add more tiles */ +for (i =1 , gtdef = &INTEL_INFO (i915)->extra_gt_list[i -1 ]; + gtdef->setup !=NULL ; + i++, gtdef = &INTEL_INFO (i915)->extra_gt_list[i -1 ]) { + gt =drmm_kzalloc (&i915->drm,sizeof (*gt),GFP_KERNEL ); +if (!gt) { + ret = -ENOMEM ; + goto err; + } + + gt->i915 = i915; + gt->name = gtdef->name; + gt->type = gtdef->type; + gt->info.engine_mask = gtdef->engine_mask; + gt->info.id = i; + +drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); +if (GEM_WARN_ON (range_overflows_t (resource_size_t, + gtdef->mapping_base, +SZ_16M , +pci_resource_len (pdev, mmio_bar)))) { + ret = -ENODEV ; + goto err; + } + + ret = gtdef->setup (gt, phys_addr + gtdef->mapping_base); +if (ret) + goto err; + + i915->gt[i] = gt; + } +return 0 ; + +err: +i915_probe_error (i915,"Failed to initialize %s! (%d)\n" , gtdef->name, ret); +intel_gt_release_all (i915); + +return ret; }int
intel_gt_tiles_init(struct drm_i915_private *i915)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@@ -1061,6 +1061,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@@ -244,6 +244,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;@@ -251,6 +265,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:1drivers/gpu/drm/i915/selftests/mock_gem_device.c +1
-1@@ -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 ) --2.37.2
PATCH 5/8 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
RE: [PATCH 5/8] drm/i915: Rename and expose common GT early init routine
Quoted 12 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Monday, August 29, 2022 10:03 AM
To: [email protected]
Cc: [email protected]; Sripada, Radhakrishna <[email protected]>; Roper, Matthew D <[email protected]>
Subject: [PATCH 5/8] drm/i915: Rename and expose common GT early init routine
Quoted 5 lines
The 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.
- RK Sripada
Quoted 56 lines
Signed-off-by Matt Roper <[email protected]>--- 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 +2
-2@@ -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)drivers/gpu/drm/i915/gt/intel_gt.c +1
-1@@ -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); }drivers/gpu/drm/i915/gt/intel_gt.c +0
-0intel_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);
--
2.37.2
PATCH 6/8 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.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/gt/intel_gt.c | 12 ++++++-- 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 | 5 ++- drivers/gpu/drm/i915/intel_uncore.c | 16 ++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 20 ++++++++++-- 9 files changed, 123 insertions(+), 8 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
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.c +9 -3
@@ -776,10 +776,15 @@ 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) +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 +837,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;
@@ -862,7 +867,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/gt/intel_gt_regs.h +8 -0
@@ -1576,4 +1576,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"
@@ -1114,6 +1117,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 ,
@@ -1127,6 +1141,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 +4 -1
@@ -247,14 +247,17 @@ struct intel_runtime_info {enum intel_gt_type {GT_PRIMARY ,GT_TILE , +GT_MEDIA , };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 +14 -2
@@ -1780,10 +1780,15 @@ __gen2_read(64)#undef GEN2_READ_FOOTER#undef GEN2_READ_HEADER +#define IS_GSI_REG (reg) ((reg) < 0x40000) +#define GEN6_READ_HEADER (x) \ - u32 offset = i915_mmio_reg_offset(reg); \ + u32 offset; \ unsigned long irqflags; \ u##x val = 0; \ + if (IS_GSI_REG(reg.reg)) \ + reg.reg += uncore->gsi_offset; \ + offset = i915_mmio_reg_offset(reg); \ assert_rpm_wakelock_held(uncore->rpm); \ spin_lock_irqsave(&uncore->lock, irqflags); \ unclaimed_reg_debug(uncore, reg, true, true)
@@ -1885,8 +1890,11 @@ __gen2_write(32)#undef GEN2_WRITE_HEADER#define GEN6_WRITE_HEADER \ - u32 offset = i915_mmio_reg_offset(reg); \ + u32 offset; \ unsigned long irqflags; \ + if (IS_GSI_REG(reg.reg)) \ + reg.reg += uncore->gsi_offset; \ + offset = i915_mmio_reg_offset(reg); \ trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \ assert_rpm_wakelock_held(uncore->rpm); \ spin_lock_irqsave(&uncore->lock, irqflags); \
@@ -2265,6 +2273,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); }
drivers/gpu/drm/i915/intel_uncore.h +18 -2
@@ -135,6 +135,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)
@@ -298,14 +308,20 @@ intel_wait_for_register_fw(struct intel_uncore *uncore, 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 (offset < 0x40000) \ + 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 (offset < 0x40000) \ + 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 6/8] drm/i915/xelpmp: Expose media as another GT
Quoted 37 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.
Cc Aravind Iddamsetty <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/gt/intel_gt.c | 12 ++++++-- 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 | 5 ++- drivers/gpu/drm/i915/intel_uncore.c | 16 ++++++++-- drivers/gpu/drm/i915/intel_uncore.h | 20 ++++++++++-- 9 files changed, 123 insertions(+), 8 deletions(-)create mode 100644
drivers/gpu/drm/i915/gt/intel_sa_media.ccreate mode 100644drivers/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.c +0
-0
drivers/gpu/drm/i915/gt/intel_gt.c void intel_gt_driver_late_release_all(struct drm_i915_private *i915) · line 781
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_gt.c +3
-1@@ -776,10 +776,15 @@ 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) +static int intel_gt_tile_setup (struct intel_gt *gt, +phys_addr_t phys_addr, +u32 gsi_offset)
This is only called from intel_gt_probe_all with gsi_offset = 0, so the extra param isn't really used at this point. I'm guessing the intent here is to keep the function params the same as intel_sa_mediagt_setup, so we can assign this to gtdef->setup() for "normal" extra tiles on xehpsdv and pvc. Maybe add a comment about it above here, so no one accidentally optimizes this out?
Quoted 66 lines
drivers/gpu/drm/i915/gt/intel_gt.c +6
-2{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 +837,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;@@ -862,7 +867,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/gt/intel_gt_regs.h +8
-0@@ -1576,4 +1576,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 +15
-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;
drivers/gpu/drm/i915/gt/intel_sa_media.c line 25
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_sa_media.c new file +10
-0+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);
Where is the initialization of this uncore completed (i.e. call to intel_uncore_init_mmio) ? Can't find it in follow up patches and without it the register access on the media GT would be broken since the function pointers in the uncore struct won't be set. Not a blocker since this is still early enabling, but I'd prefer if this limitation (and follow up remediation plan) was stated in the commit message or cover letter.
Quoted 106 lines
drivers/gpu/drm/i915/gt/intel_sa_media.c new file +14
-0+ +/* +* 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" @@ -1114,6 +1117,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 ,@@ -1127,6 +1141,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 +4
-1@@ -247,14 +247,17 @@ struct intel_runtime_info {enum intel_gt_type {GT_PRIMARY ,GT_TILE , +GT_MEDIA , };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 +0
-0@@ -1780,10 +1780,15 @@ __gen2_read(64)#undef GEN2_READ_FOOTER#undef GEN2_READ_HEADER
drivers/gpu/drm/i915/intel_uncore.c __gen2_read(64) · line 1791
Quoted 10 lines
drivers/gpu/drm/i915/intel_uncore.c +6
-1+#define IS_GSI_REG (reg) ((reg) < 0x40000) +#define GEN6_READ_HEADER (x) \ - u32 offset = i915_mmio_reg_offset(reg); \ + u32 offset; \ unsigned long irqflags; \ u##x val = 0; \ + if (IS_GSI_REG(reg.reg)) \ + reg.reg += uncore->gsi_offset; \ + offset = i915_mmio_reg_offset(reg); \
I was initially confused here on why you were modifying reg.reg to then extract it, but then I realized other function further down use the reg variable as well, so this would adapt it for them all. However, it still seem weird to me to use both offset and reg in an interleaved way in the code and IMO we should converge on one. It looks like there is only one use of "offset", so maybe that's the one we can drop. Not something that needs to be done in this patch, just reflecting on it.
Quoted 49 lines
drivers/gpu/drm/i915/intel_uncore.c +8
-1assert_rpm_wakelock_held (uncore->rpm); \spin_lock_irqsave (&uncore->lock, irqflags); \unclaimed_reg_debug (uncore, reg, true, true)@@ -1885,8 +1890,11 @@ __gen2_write(32)#undef GEN2_WRITE_HEADER#define GEN6_WRITE_HEADER \ - u32 offset = i915_mmio_reg_offset(reg); \ + u32 offset; \ unsigned long irqflags; \ + if (IS_GSI_REG(reg.reg)) \ + reg.reg += uncore->gsi_offset; \ + offset = i915_mmio_reg_offset(reg); \ trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \ assert_rpm_wakelock_held(uncore->rpm); \ spin_lock_irqsave(&uncore->lock, irqflags); \@@ -2265,6 +2273,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); }drivers/gpu/drm/i915/intel_uncore.h +10
-0@@ -135,6 +135,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)
drivers/gpu/drm/i915/intel_uncore.h intel_wait_for_register_fw(struct intel_uncore *uncore, · line 312
Quoted 6 lines
drivers/gpu/drm/i915/intel_uncore.h +2
-1@@ -298,14 +308,20 @@ intel_wait_for_register_fw(struct intel_uncore *uncore, 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 (offset < 0x40000) \
Any reason not to have IS_GSI_REG() defined in this header and used here?
Daniele
Quoted 16 lines
drivers/gpu/drm/i915/intel_uncore.h +6
-1+ 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 (offset < 0x40000) \ + offset += uncore->gsi_offset; \ + write##s__(val, uncore->regs + offset); \ } __raw_read(8, b)__raw_read (16 , w)
PATCH 7/8 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.
--- 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 | 4 ++- 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, 77 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)
@@ -787,12 +792,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 = &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 +3 -1
@@ -357,7 +357,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_workqueues;i915_drm_clients_init (&dev_priv->clients, 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
Re: [PATCH 7/8] drm/i915/mtl: Use primary GT's irq lock for media GT
Quoted 345 lines · Matt Roper
When 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_lockinto a pointer and just point the media GT's instance at the same lock the primary GT is using.Cc Daniele Ceraolo Spurio <[email protected]>Signed-off-by Matt Roper <[email protected]>--- 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 | 4 ++- 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, 77 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)@@ -787,12 +792,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 +0
-0
drivers/gpu/drm/i915/gt/intel_sa_media.c int intel_sa_mediagt_setup(struct intel_gt *gt, phys_addr_t phys_addr, · line 24
Quoted 4 lines
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 = &i915->irq_lock;
shouldn't this be i915->gt0->irq_lock?
Quoted 125 lines
drivers/gpu/drm/i915/gt/intel_sa_media.c +0
-0intel_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 +0
-0
drivers/gpu/drm/i915/i915_driver.c static int i915_driver_early_probe(struct drm_i915_private *dev_priv) · line 362
Quoted 7 lines
drivers/gpu/drm/i915/i915_driver.c +3
-1@@ -357,7 +357,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_workqueues;
I think this needs a new goto case because we need to cleanup ttm.
Daniele
Quoted 110 lines
drivers/gpu/drm/i915/i915_driver.c +0
-0i915_drm_clients_init (&dev_priv->clients, 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 ;
PATCH 8/8 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
@@ -1552,6 +1552,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
@@ -497,6 +497,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
Re: [PATCH 8/8] drm/i915/mtl: Hook up interrupts for standalone media
Quoted 6 lines · Matt Roper
Top-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.
Quoted 7 lines
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
Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>
Daniele
Quoted 100 lines
--- 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@@ -1552,6 +1552,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@@ -497,6 +497,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 */
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for i915: Add "standalone media" support for MTL
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL
URL : https://patchwork.freedesktop.org/series/107908/
State : warning
== Summary ==
Error: dim checkpatch failed2d07e36f0a4f drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume} 943c8e30fc24 drm/i915: Only hook up uncore->debug for primary uncore 005c7f1709b6 drm/i915: Use managed allocations for extra uncore objects 001d8b25313a drm/i915: Prepare more multi-GT initialization
-:70: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "gtdef->setup" #70: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:842:
+ gtdef->setup != NULL;
total: 0 errors, 0 warnings, 1 checks, 142 lines checked6e44c6e54b94 drm/i915: Rename and expose common GT early init routine 2c5537309641 drm/i915/xelpmp: Expose media as another GT
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:83: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #83:
new file mode 100644
-:119: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!uncore->regs" #119: 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, 233 lines checked 06eba434c957 drm/i915/mtl: Use primary GT's irq lock for media GT -:81: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #81: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:795:
+ spinlock_t *irq_lock;
-:227: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #227: FILE: drivers/gpu/drm/i915/gt/intel_gt_types.h:160:
+ spinlock_t *irq_lock;
total: 0 errors, 0 warnings, 2 checks, 459 lines checked 3be80c873513 drm/i915/mtl: Hook up interrupts for standalone media
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for i915: Add "standalone media" support for MTL
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL
URL : https://patchwork.freedesktop.org/series/107908/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12044 -> Patchwork_107908v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_107908v1 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_107908v1, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/index.html
Participating hosts (40 -> 35)
------------------------------
Missing (5): fi-rkl-11600 fi-hsw-4200u fi-ctg-p8600 bat-jsl-3 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_107908v1:
### IGT changes ###
#### Possible regressions ####
* igt@i915_module_load@load:
- fi-skl-6600u: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-skl-6600u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-skl-6600u/igt@[email protected]
- bat-dg1-5: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-dg1-5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-dg1-5/igt@[email protected]
- fi-bdw-gvtdvm: [PASS][5] -> [INCOMPLETE][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-bdw-gvtdvm/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-bdw-gvtdvm/igt@[email protected]
- fi-pnv-d510: [PASS][7] -> [INCOMPLETE][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-pnv-d510/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-pnv-d510/igt@[email protected]
- fi-snb-2520m: [PASS][9] -> [INCOMPLETE][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-snb-2520m/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-snb-2520m/igt@[email protected]
- fi-glk-j4005: [PASS][11] -> [INCOMPLETE][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-glk-j4005/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-glk-j4005/igt@[email protected]
- fi-rkl-guc: [PASS][13] -> [INCOMPLETE][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-rkl-guc/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-rkl-guc/igt@[email protected]
- fi-skl-6700k2: [PASS][15] -> [INCOMPLETE][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-skl-6700k2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-skl-6700k2/igt@[email protected]
- fi-kbl-7567u: [PASS][17] -> [INCOMPLETE][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-kbl-7567u/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-kbl-7567u/igt@[email protected]
- fi-cfl-8700k: [PASS][19] -> [INCOMPLETE][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-8700k/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-cfl-8700k/igt@[email protected]
- fi-elk-e7500: [PASS][21] -> [INCOMPLETE][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-elk-e7500/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-elk-e7500/igt@[email protected]
- fi-hsw-g3258: [PASS][23] -> [INCOMPLETE][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-hsw-g3258/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-hsw-g3258/igt@[email protected]
- fi-bsw-kefka: [PASS][25] -> [INCOMPLETE][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-bsw-kefka/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-bsw-kefka/igt@[email protected]
- fi-adl-ddr5: [PASS][27] -> [INCOMPLETE][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-adl-ddr5/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-adl-ddr5/igt@[email protected]
- fi-cfl-guc: [PASS][29] -> [INCOMPLETE][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-guc/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-cfl-guc/igt@[email protected]
- fi-bdw-5557u: [PASS][31] -> [INCOMPLETE][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-bdw-5557u/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-bdw-5557u/igt@[email protected]
- fi-hsw-4770: [PASS][33] -> [INCOMPLETE][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-hsw-4770/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-hsw-4770/igt@[email protected]
- fi-cfl-8109u: [PASS][35] -> [INCOMPLETE][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-8109u/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-cfl-8109u/igt@[email protected]
- bat-adlp-4: [PASS][37] -> [INCOMPLETE][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-adlp-4/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-adlp-4/igt@[email protected]
- fi-ivb-3770: [PASS][39] -> [INCOMPLETE][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-ivb-3770/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-ivb-3770/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_module_load@load:
- {fi-jsl-1}: [PASS][41] -> [INCOMPLETE][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-jsl-1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-jsl-1/igt@[email protected]
- {bat-rpls-1}: [PASS][43] -> [INCOMPLETE][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-rpls-1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-rpls-1/igt@[email protected]
- {fi-ehl-2}: [PASS][45] -> [INCOMPLETE][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-ehl-2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-ehl-2/igt@[email protected]
- {bat-dg2-11}: [PASS][47] -> [INCOMPLETE][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-dg2-11/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-dg2-11/igt@[email protected]
- {bat-adln-1}: [PASS][49] -> [INCOMPLETE][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-adln-1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-adln-1/igt@[email protected]
- {bat-rplp-1}: [PASS][51] -> [INCOMPLETE][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-rplp-1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-rplp-1/igt@[email protected]
- {bat-dg2-10}: [PASS][53] -> [INCOMPLETE][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-dg2-10/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-dg2-10/igt@[email protected]
- {bat-dg2-9}: [PASS][55] -> [INCOMPLETE][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-dg2-9/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-dg2-9/igt@[email protected]
- {bat-dg2-8}: [PASS][57] -> [INCOMPLETE][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-dg2-8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-dg2-8/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_107908v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@runner@aborted:
- fi-hsw-4770: NOTRUN -> [FAIL][59] ([i915#4312] / [i915#5594] / [i915#6246])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-hsw-4770/igt@[email protected]
- fi-skl-6700k2: NOTRUN -> [FAIL][60] ([i915#4312] / [i915#6599])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-skl-6700k2/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [FAIL][61] ([i915#4312] / [i915#6599])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-cfl-8109u/igt@[email protected]
- bat-adlp-4: NOTRUN -> [FAIL][62] ([i915#4312] / [i915#6641])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-adlp-4/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][63] ([i915#4312] / [i915#6219])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-ivb-3770/igt@[email protected]
- fi-elk-e7500: NOTRUN -> [FAIL][64] ([i915#4312])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-elk-e7500/igt@[email protected]
- fi-skl-6600u: NOTRUN -> [FAIL][65] ([i915#4312] / [i915#6599])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-skl-6600u/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][66] ([i915#4312])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-bdw-5557u/igt@[email protected]
- fi-snb-2520m: NOTRUN -> [FAIL][67] ([i915#4312])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-snb-2520m/igt@[email protected]
- fi-glk-j4005: NOTRUN -> [FAIL][68] ([i915#4312] / [i915#6599])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-glk-j4005/igt@[email protected]
- fi-rkl-guc: NOTRUN -> [FAIL][69] ([i915#4312] / [i915#6599])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-rkl-guc/igt@[email protected]
- fi-kbl-7567u: NOTRUN -> [FAIL][70] ([i915#4312] / [i915#6219])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-kbl-7567u/igt@[email protected]
- fi-cfl-8700k: NOTRUN -> [FAIL][71] ([i915#4312] / [i915#6599])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-cfl-8700k/igt@[email protected]
- fi-hsw-g3258: NOTRUN -> [FAIL][72] ([i915#4312] / [i915#6246])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-hsw-g3258/igt@[email protected]
- fi-bdw-gvtdvm: NOTRUN -> [FAIL][73] ([i915#4312])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-bdw-gvtdvm/igt@[email protected]
- fi-bsw-kefka: NOTRUN -> [FAIL][74] ([i915#4312])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-bsw-kefka/igt@[email protected]
- fi-adl-ddr5: NOTRUN -> [FAIL][75] ([i915#4312] / [i915#6599])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-adl-ddr5/igt@[email protected]
- fi-cfl-guc: NOTRUN -> [FAIL][76] ([i915#4312] / [i915#6599])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-cfl-guc/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- bat-dg1-5: [FAIL][77] ([i915#4312] / [i915#5257]) -> [FAIL][78] ([i915#4312])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-dg1-5/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/bat-dg1-5/igt@[email protected]
- fi-pnv-d510: [FAIL][79] ([fdo#109271] / [i915#2403] / [i915#4312]) -> [FAIL][80] ([i915#2403] / [i915#4312])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-pnv-d510/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v1/fi-pnv-d510/igt@[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
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5594]: https://gitlab.freedesktop.org/drm/intel/issues/5594
[i915#6219]: https://gitlab.freedesktop.org/drm/intel/issues/6219
[i915#6246]: https://gitlab.freedesktop.org/drm/intel/issues/6246
[i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599
[i915#6641]: https://gitlab.freedesktop.org/drm/intel/issues/6641
Build changes
-------------
* Linux: CI_DRM_12044 -> Patchwork_107908v1
CI-20190529: 20190529
CI_DRM_12044: 287ad23d60ce7aa8befbe8dd1fea6fb705bd08ac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6637: a23e8aed0b54018339647d0817267431bd2b7075 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107908v1: 287ad23d60ce7aa8befbe8dd1fea6fb705bd08ac @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
a6b6b5f37d32 drm/i915/mtl: Hook up interrupts for standalone media 413dd3f3d9ae drm/i915/mtl: Use primary GT's irq lock for media GT d3cf582e087e drm/i915/xelpmp: Expose media as another GTa75ac0055de9 drm/i915: Rename and expose common GT early init routine 138d6fa3bf27 drm/i915: Prepare more multi-GT initialization3c53793f1846 drm/i915: Use managed allocations for extra uncore objects 69205cc0ec5f drm/i915: Only hook up uncore->debug for primary uncore 8188d75ce38c 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_107908v1/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for i915: Add "standalone media" support for MTL (rev2)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev2)
URL : https://patchwork.freedesktop.org/series/107908/
State : warning
== Summary ==
Error: dim checkpatch failedb89acd14d33e drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume} f45cffb31b0a drm/i915: Only hook up uncore->debug for primary uncore 56a84766b498 drm/i915: Use managed allocations for extra uncore objects 999eb6f42ba7 drm/i915: Prepare more multi-GT initialization
-:76: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "gtdef->setup" #76: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:845:
+ gtdef->setup != NULL;
total: 0 errors, 0 warnings, 1 checks, 145 lines checkedf0fd6fde9ebe drm/i915: Rename and expose common GT early init routine fe239df10fe1 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'
-:83: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #83:
new file mode 100644
-:119: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!uncore->regs" #119: 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, 233 lines checked 0bda84aacacf drm/i915/mtl: Use primary GT's irq lock for media GT -:81: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #81: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:795:
+ spinlock_t *irq_lock;
-:227: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #227: FILE: drivers/gpu/drm/i915/gt/intel_gt_types.h:160:
+ spinlock_t *irq_lock;
total: 0 errors, 0 warnings, 2 checks, 459 lines checked 4c2b96042803 drm/i915/mtl: Hook up interrupts for standalone media
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for i915: Add "standalone media" support for MTL (rev2)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev2)
URL : https://patchwork.freedesktop.org/series/107908/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12044 -> Patchwork_107908v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/index.html
Participating hosts (40 -> 34)
------------------------------
Missing (6): fi-hsw-4200u bat-dg1-5 bat-adlp-4 fi-ctg-p8600 bat-dg2-11 fi-bdw-samus
Known issues
------------
Here are the changes found in Patchwork_107908v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@module-reload:
- fi-cfl-8109u: [PASS][1] -> [DMESG-FAIL][2] ([i915#62])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-8109u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-cfl-8109u/igt@[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_12044/fi-pnv-d510/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-pnv-d510/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@ring_submission:
- fi-cfl-8109u: [PASS][5] -> [DMESG-WARN][6] ([i915#5904]) +30 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-8109u/igt@i915_selftest@live@ring_submission.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-cfl-8109u/igt@i915_selftest@live@ring_submission.html
* igt@i915_suspend@basic-s2idle-without-i915:
- fi-cfl-8109u: [PASS][7] -> [DMESG-WARN][8] ([i915#5904] / [i915#62])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-8109u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-cfl-8109u/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-bdw-5557u: NOTRUN -> [SKIP][9] ([fdo#109271] / [fdo#111827])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-bdw-5557u/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size:
- fi-bsw-kefka: [PASS][10] -> [FAIL][11] ([i915#6298])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
* igt@kms_frontbuffer_tracking@basic:
- fi-cfl-8109u: [PASS][12] -> [DMESG-WARN][13] ([i915#62]) +11 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-cfl-8109u/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-cfl-8109u/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][14] ([i915#2867]) -> [PASS][15] +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/bat-rplp-1/igt@gem_exec_suspend@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/bat-rplp-1/igt@gem_exec_suspend@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-bdw-5557u: [INCOMPLETE][16] ([i915#146] / [i915#6598]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/fi-bdw-5557u/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/fi-bdw-5557u/igt@[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#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5278]: https://gitlab.freedesktop.org/drm/intel/issues/5278
[i915#5828]: https://gitlab.freedesktop.org/drm/intel/issues/5828
[i915#5904]: https://gitlab.freedesktop.org/drm/intel/issues/5904
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6530]: https://gitlab.freedesktop.org/drm/intel/issues/6530
[i915#6598]: https://gitlab.freedesktop.org/drm/intel/issues/6598
[i915#6670]: https://gitlab.freedesktop.org/drm/intel/issues/6670
Build changes
-------------
* Linux: CI_DRM_12044 -> Patchwork_107908v2
CI-20190529: 20190529
CI_DRM_12044: 287ad23d60ce7aa8befbe8dd1fea6fb705bd08ac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6637: a23e8aed0b54018339647d0817267431bd2b7075 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107908v2: 287ad23d60ce7aa8befbe8dd1fea6fb705bd08ac @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
c4e2f29f8c6b drm/i915/mtl: Hook up interrupts for standalone media e1285aa47154 drm/i915/mtl: Use primary GT's irq lock for media GT b4f903e749b6 drm/i915/xelpmp: Expose media as another GT2d1df155b6e2 drm/i915: Rename and expose common GT early init routine 638b7b0b7759 drm/i915: Prepare more multi-GT initializationed44a8127715 drm/i915: Use managed allocations for extra uncore objects 67b3c4f78f19 drm/i915: Only hook up uncore->debug for primary uncore 9851a6cb1ca3 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_107908v2/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for i915: Add "standalone media" support for MTL (rev2)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: i915: Add "standalone media" support for MTL (rev2)
URL : https://patchwork.freedesktop.org/series/107908/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12044_full -> Patchwork_107908v2_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (12 -> 13)
------------------------------
Additional (1): shard-dg1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_107908v2_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@kms_flip@flip-vs-expired-vblank@d-hdmi-a1:
- {shard-dg1}: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-dg1-16/igt@kms_flip@[email protected]
Known issues
------------
Here are the changes found in Patchwork_107908v2_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@parallel:
- shard-iclb: [PASS][2] -> [SKIP][3] ([i915#4525]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb2/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb6/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-apl: NOTRUN -> [FAIL][4] ([i915#2846])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl3/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-verify:
- shard-apl: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- shard-snb: [PASS][6] -> [INCOMPLETE][7] ([i915#3921])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-snb5/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-snb4/igt@i915_selftest@[email protected]
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#3886]) +7 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@vga-frame-dump:
- shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [fdo#111827]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl3/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
- shard-apl: [PASS][10] -> [DMESG-WARN][11] ([i915#180])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl7/igt@kms_flip@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl2/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][12] ([i915#2672]) +6 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb5/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][13] ([i915#3555])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling@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][14] ([i915#2672] / [i915#3555])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb5/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling@pipe-a-valid-mode.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][15] ([i915#265])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][16] ([fdo#108145] / [i915#265]) +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl3/igt@[email protected]
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1:
- shard-iclb: [PASS][17] -> [SKIP][18] ([i915#5176]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb6/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb3/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
* igt@kms_plane_scaling@plane-upscale-with-rotation-factor-0-25@pipe-a-dp-1:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271]) +91 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@kms_plane_scaling@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-apl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#658]) +1 similar issue
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl3/igt@[email protected]
* igt@kms_psr@psr2_sprite_mmap_cpu:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109441]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb3/igt@kms_psr@psr2_sprite_mmap_cpu.html
* igt@kms_psr_stress_test@flip-primary-invalidate-overlay:
- shard-iclb: [PASS][23] -> [SKIP][24] ([i915#5519])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb7/igt@[email protected]
* igt@kms_writeback@writeback-pixel-formats:
- shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#2437]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl3/igt@[email protected]
* igt@sysfs_clients@fair-7:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#2994]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@[email protected]
#### Possible fixes ####
* igt@gem_eio@in-flight-contexts-10ms:
- shard-iclb: [TIMEOUT][27] ([i915#3070]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb8/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb5/igt@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][29] ([i915#2842]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl6/igt@gem_exec_fair@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][31] ([i915#2842]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb7/igt@gem_exec_fair@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb7/igt@gem_exec_fair@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-apl: [DMESG-WARN][33] ([i915#5566] / [i915#716]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@[email protected]
* igt@kms_cursor_crc@cursor-suspend@pipe-a-dp-1:
- shard-apl: [DMESG-WARN][35] ([i915#180]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl2/igt@kms_cursor_crc@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@kms_cursor_crc@[email protected]
* igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-32bpp-xtile-downscaling@pipe-a-default-mode:
- shard-iclb: [SKIP][37] ([i915#3555]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-32bpp-xtile-downscaling@pipe-a-default-mode.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-32bpp-xtile-downscaling@pipe-a-default-mode.html
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb6/igt@kms_psr@psr2_cursor_blt.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
* igt@perf@polling-parameterized:
- shard-apl: [FAIL][41] ([i915#5639]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl1/igt@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][43] ([i915#588]) -> [SKIP][44] ([i915#658])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb6/igt@[email protected]
* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-fully-sf:
- shard-iclb: [SKIP][45] ([i915#658]) -> [SKIP][46] ([i915#2920])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb2/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-iclb: [SKIP][47] ([i915#2920]) -> [SKIP][48] ([i915#658]) +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-iclb2/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-iclb6/igt@[email protected]
* igt@runner@aborted:
- shard-apl: ([FAIL][49], [FAIL][50], [FAIL][51], [FAIL][52], [FAIL][53], [FAIL][54]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312] / [i915#5257] / [i915#6599]) -> ([FAIL][55], [FAIL][56], [FAIL][57]) ([i915#180] / [i915#3002] / [i915#4312] / [i915#5257] / [i915#6599])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl7/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl2/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl7/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl2/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12044/shard-apl6/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl6/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl8/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_107908v2/shard-apl2/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[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#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[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#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[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#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[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#2433]: https://gitlab.freedesktop.org/drm/intel/issues/2433
[i915#2435]: https://gitlab.freedesktop.org/drm/intel/issues/2435
[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#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[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#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#3070]: https://gitlab.freedesktop.org/drm/intel/issues/3070
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[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#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[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#3828]: https://gitlab.freedesktop.org/drm/intel/issues/3828
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#3952]: https://gitlab.freedesktop.org/drm/intel/issues/3952
[i915#4036]: https://gitlab.freedesktop.org/drm/intel/issues/4036
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4369]: https://gitlab.freedesktop.org/drm/intel/issues/4369
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4853]: https://gitlab.freedesktop.org/drm/intel/issues/4853
[i915#4855]: https://gitlab.freedesktop.org/drm/intel/issues/4855
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4874]: https://gitlab.freedesktop.org/drm/intel/issues/4874
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#4879]: https://gitlab.freedesktop.org/drm/intel/issues/4879
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4881]: https://gitlab.freedesktop.org/drm/intel/issues/4881
[i915#4883]: https://gitlab.freedesktop.org/drm/intel/issues/4883
[i915#4884]: https://gitlab.freedesktop.org/drm/intel/issues/4884
[i915#4885]: https://gitlab.freedesktop.org/drm/intel/issues/4885
[i915#4893]: https://gitlab.freedesktop.org/drm/intel/issues/4893
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
[i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958
[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#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[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#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[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#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#6011]: https://gitlab.freedesktop.org/drm/intel/issues/6011
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6331]: https://gitlab.freedesktop.org/drm/intel/issues/6331
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6463]: https://gitlab.freedesktop.org/drm/intel/issues/6463
[i915#6493]: https://gitlab.freedesktop.org/drm/intel/issues/6493
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
Build changes
-------------
* Linux: CI_DRM_12044 -> Patchwork_107908v2
CI-20190529: 20190529
CI_DRM_12044: 287ad23d60ce7aa8befbe8dd1fea6fb705bd08ac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6637: a23e8aed0b54018339647d0817267431bd2b7075 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_107908v2: 287ad23d60ce7aa8befbe8dd1fea6fb705bd08ac @ 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_107908v2/index.html