More mmio and intel_gt cleanups and refactorings
Subsystems (2)
cover More mmio and intel_gt cleanups and refactorings
From: Tvrtko Ursulin <[email protected]>
A mini-series which converts to intel_gt and removes some legacy mmio accessors mostly around interrupt and RPS handling areas.
All patches were actually started by Paulo and I have attributed that with the Co-authored-by tag. But given rebases and some other changes I made, I did take authorship. Paulo please state your preference - are you happy with this or you would prefer I swap our names between the author and co-authored tags?
Tvrtko Ursulin (3):
drm/i915: Rework some interrupt handling functions to take intel_gt drm/i915: Remove some legacy mmio accessors from interrupt handling drm/i915: Move dev_priv->pm_i{m,e}r into intel_gt
drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 276 +++++++++++---------- drivers/gpu/drm/i915/i915_irq.h | 4 +- 5 files changed, 152 insertions(+), 137 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915: Rework some interrupt handling functions to take intel_gt
From: Tvrtko Ursulin <[email protected]>
Some interrupt handling functions already have gt in their names suggesting them as obvious candidates to make them take struct intel_gt instead of i915.
--- drivers/gpu/drm/i915/i915_irq.c | 88 +++++++++++++++++---------------- 1 file changed, 46 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +46 -42
@@ -305,17 +305,17 @@ void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv, }static u32 -gen11_gt_engine_identity (struct drm_i915_private *const i915, +gen11_gt_engine_identity (struct intel_gt *gt,const unsigned int bank,const unsigned int bit); -static bool gen11_reset_one_iir (struct drm_i915_private *const i915, +static bool gen11_reset_one_iir (struct intel_gt *gt,const unsigned int bank,const unsigned int bit) { -void __iomem *const regs = i915->uncore.regs; +void __iomem *const regs = gt->uncore->regs;u32 dw; -lockdep_assert_held (&i915->irq_lock); +lockdep_assert_held (>->i915->irq_lock); dw =raw_reg_read (regs,GEN11_GT_INTR_DW (bank));if (dw &BIT (bit)) {
@@ -323,7 +323,7 @@ static bool gen11_reset_one_iir(struct drm_i915_private * const i915,* According to the BSpec, DW_IIR bits cannot be cleared without * first servicing the Selector & Shared IIR registers. */ -gen11_gt_engine_identity (i915, bank, bit); +gen11_gt_engine_identity (gt, bank, bit);/* * We locked GT INT DW by reading it. If we want to (try
@@ -528,7 +528,7 @@ void gen11_reset_rps_interrupts(struct drm_i915_private *dev_priv) {spin_lock_irq (&dev_priv->irq_lock); -while (gen11_reset_one_iir (dev_priv,0 ,GEN11_GTPM )) +while (gen11_reset_one_iir (&dev_priv->gt,0 ,GEN11_GTPM )) ; dev_priv->gt_pm.rps.pm_iir =0 ;
@@ -555,7 +555,7 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)WARN_ON_ONCE (rps->pm_iir);if (INTEL_GEN (dev_priv) >=11 ) -WARN_ON_ONCE (gen11_reset_one_iir (dev_priv,0 ,GEN11_GTPM )); +WARN_ON_ONCE (gen11_reset_one_iir (&dev_priv->gt,0 ,GEN11_GTPM ));else WARN_ON_ONCE (I915_READ (gen6_pm_iir (dev_priv)) & dev_priv->pm_rps_events);
@@ -635,7 +635,7 @@ void gen9_disable_guc_interrupts(struct drm_i915_private *dev_priv)void gen11_reset_guc_interrupts (struct drm_i915_private *i915) {spin_lock_irq (&i915->irq_lock); -gen11_reset_one_iir (i915,0 ,GEN11_GUC ); +gen11_reset_one_iir (&i915->gt,0 ,GEN11_GUC );spin_unlock_irq (&i915->irq_lock); }
@@ -646,7 +646,7 @@ void gen11_enable_guc_interrupts(struct drm_i915_private *dev_priv)u32 events =REG_FIELD_PREP (ENGINE1_MASK ,GEN11_GUC_INTR_GUC2HOST ); -WARN_ON_ONCE (gen11_reset_one_iir (dev_priv,0 ,GEN11_GUC )); +WARN_ON_ONCE (gen11_reset_one_iir (&dev_priv->gt,0 ,GEN11_GUC ));I915_WRITE (GEN11_GUC_SG_INTR_ENABLE , events);I915_WRITE (GEN11_GUC_SG_INTR_MASK , ~events); dev_priv->guc.interrupts.enabled = true;
@@ -3033,14 +3033,14 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) }static u32 -gen11_gt_engine_identity (struct drm_i915_private *const i915, +gen11_gt_engine_identity (struct intel_gt *gt,const unsigned int bank,const unsigned int bit) { -void __iomem *const regs = i915->uncore.regs; +void __iomem *const regs = gt->uncore->regs;u32 timeout_ts;u32 ident; -lockdep_assert_held (&i915->irq_lock); +lockdep_assert_held (>->i915->irq_lock);raw_reg_write (regs,GEN11_IIR_REG_SELECTOR (bank),BIT (bit));
@@ -3067,9 +3067,11 @@ gen11_gt_engine_identity(struct drm_i915_private * const i915, }static void -gen11_other_irq_handler (struct drm_i915_private *const i915, -const u8 instance,const u16 iir) +gen11_other_irq_handler (struct intel_gt *gt,const u8 instance, +const u16 iir) { +struct drm_i915_private *i915 = gt->i915; +if (instance ==OTHER_GUC_INSTANCE )return gen11_guc_irq_handler (i915, iir);
@@ -3081,13 +3083,13 @@ gen11_other_irq_handler(struct drm_i915_private * const i915, }static void -gen11_engine_irq_handler (struct drm_i915_private *const i915, -const u8 class,const u8 instance,const u16 iir) +gen11_engine_irq_handler (struct intel_gt *gt,const u8 class, +const u8 instance,const u16 iir) {struct intel_engine_cs *engine;if (instance <=MAX_ENGINE_INSTANCE ) - engine = i915->engine_class[class][instance]; + engine = gt->i915->engine_class[class][instance];else engine =NULL ;
@@ -3099,8 +3101,7 @@ gen11_engine_irq_handler(struct drm_i915_private * const i915, }static void -gen11_gt_identity_handler (struct drm_i915_private *const i915, -const u32 identity) +gen11_gt_identity_handler (struct intel_gt *gt,const u32 identity) {const u8 class =GEN11_INTR_ENGINE_CLASS (identity);const u8 instance =GEN11_INTR_ENGINE_INSTANCE (identity);
@@ -3110,31 +3111,30 @@ gen11_gt_identity_handler(struct drm_i915_private * const i915,return ;if (class <=COPY_ENGINE_CLASS ) -return gen11_engine_irq_handler (i915, class, instance, intr); +return gen11_engine_irq_handler (gt, class, instance, intr);if (class ==OTHER_CLASS ) -return gen11_other_irq_handler (i915, instance, intr); +return gen11_other_irq_handler (gt, instance, intr);WARN_ONCE (1 ,"unknown interrupt class=0x%x, instance=0x%x, intr=0x%x\n" , class, instance, intr); }static void -gen11_gt_bank_handler (struct drm_i915_private *const i915, -const unsigned int bank) +gen11_gt_bank_handler (struct intel_gt *gt,const unsigned int bank) { -void __iomem *const regs = i915->uncore.regs; +void __iomem *const regs = gt->uncore->regs;unsigned long intr_dw;unsigned int bit; -lockdep_assert_held (&i915->irq_lock); +lockdep_assert_held (>->i915->irq_lock); intr_dw =raw_reg_read (regs,GEN11_GT_INTR_DW (bank));for_each_set_bit (bit, &intr_dw,32 ) { -const u32 ident =gen11_gt_engine_identity (i915, bank, bit); +const u32 ident =gen11_gt_engine_identity (gt, bank, bit); -gen11_gt_identity_handler (i915, ident); +gen11_gt_identity_handler (gt, ident); }/* Clear must be after shared has been served for engine */
@@ -3142,25 +3142,25 @@ gen11_gt_bank_handler(struct drm_i915_private * const i915, }static void -gen11_gt_irq_handler (struct drm_i915_private *const i915, -const u32 master_ctl) +gen11_gt_irq_handler (struct intel_gt *gt,const u32 master_ctl) { +struct drm_i915_private *i915 = gt->i915;unsigned int bank;spin_lock (&i915->irq_lock);for (bank =0 ; bank <2 ; bank++) {if (master_ctl &GEN11_GT_DW_IRQ (bank)) -gen11_gt_bank_handler (i915, bank); +gen11_gt_bank_handler (gt, bank); }spin_unlock (&i915->irq_lock); }static u32 -gen11_gu_misc_irq_ack (struct drm_i915_private *dev_priv,const u32 master_ctl) +gen11_gu_misc_irq_ack (struct intel_gt *gt,const u32 master_ctl) { -void __iomem *const regs = dev_priv->uncore.regs; +void __iomem *const regs = gt->uncore->regs;u32 iir;if (!(master_ctl &GEN11_GU_MISC_IRQ ))
@@ -3174,10 +3174,10 @@ gen11_gu_misc_irq_ack(struct drm_i915_private *dev_priv, const u32 master_ctl) }static void -gen11_gu_misc_irq_handler (struct drm_i915_private *dev_priv,const u32 iir) +gen11_gu_misc_irq_handler (struct intel_gt *gt,const u32 iir) {if (iir &GEN11_GU_MISC_GSE ) -intel_opregion_asle_intr (dev_priv); +intel_opregion_asle_intr (gt->i915); }static inline u32 gen11_master_intr_disable (void __iomem *const regs)
@@ -3202,6 +3202,7 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg) {struct drm_i915_private *const i915 = arg;void __iomem *const regs = i915->uncore.regs; +struct intel_gt *gt = &i915->gt;u32 master_ctl;u32 gu_misc_iir;
@@ -3215,7 +3216,7 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg) }/* Find, clear, then process each source of interrupt. */ -gen11_gt_irq_handler (i915, master_ctl); +gen11_gt_irq_handler (gt, master_ctl);/* IRQs are synced during runtime_suspend, we don't require a wakeref */ if (master_ctl &GEN11_DISPLAY_IRQ ) {
@@ -3230,11 +3231,11 @@ static irqreturn_t gen11_irq_handler(int irq, void *arg)enable_rpm_wakeref_asserts (&i915->runtime_pm); } - gu_misc_iir =gen11_gu_misc_irq_ack (i915, master_ctl); + gu_misc_iir =gen11_gu_misc_irq_ack (gt, master_ctl);gen11_master_intr_enable (regs); -gen11_gu_misc_irq_handler (i915, gu_misc_iir); +gen11_gu_misc_irq_handler (gt, gu_misc_iir);return IRQ_HANDLED ; }
@@ -3590,8 +3591,10 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv)ibx_irq_reset (dev_priv); } -static void gen11_gt_irq_reset (struct drm_i915_private *dev_priv) +static void gen11_gt_irq_reset (struct intel_gt *gt) { +struct drm_i915_private *dev_priv = gt->i915; +/* Disable RCS, BCS, VCS and VECS class engines. */ I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE ,0 );I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE ,0 );
@@ -3616,7 +3619,7 @@ static void gen11_irq_reset(struct drm_i915_private *dev_priv)gen11_master_intr_disable (dev_priv->uncore.regs); -gen11_gt_irq_reset (dev_priv); +gen11_gt_irq_reset (&dev_priv->gt);I915_WRITE (GEN11_DISPLAY_INT_CTL ,0 );
@@ -4222,8 +4225,9 @@ static void gen8_irq_postinstall(struct drm_i915_private *dev_priv)gen8_master_intr_enable (dev_priv->uncore.regs); } -static void gen11_gt_irq_postinstall (struct drm_i915_private *dev_priv) +static void gen11_gt_irq_postinstall (struct intel_gt *gt) { +struct drm_i915_private *dev_priv = gt->i915;const u32 irqs =GT_RENDER_USER_INTERRUPT |GT_CONTEXT_SWITCH_INTERRUPT ;BUILD_BUG_ON (irqs &0xffff0000 );
@@ -4275,14 +4279,14 @@ static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP )icp_irq_postinstall (dev_priv); -gen11_gt_irq_postinstall (dev_priv); +gen11_gt_irq_postinstall (&dev_priv->gt);gen8_de_irq_postinstall (dev_priv);GEN3_IRQ_INIT (uncore,GEN11_GU_MISC_ , ~gu_misc_masked, gu_misc_masked);I915_WRITE (GEN11_DISPLAY_INT_CTL ,GEN11_DISPLAY_IRQ_ENABLE ); -gen11_master_intr_enable (dev_priv->uncore.regs); +gen11_master_intr_enable (uncore->regs);POSTING_READ (GEN11_GFX_MSTR_IRQ ); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915: Rework some interrupt handling functions to take intel_gt
Quoting Tvrtko Ursulin (2019-07-02 11:23:11)
Quoted 12 lines
From: Tvrtko Ursulin <[email protected]>
Some interrupt handling functions already have gt in their names suggesting them as obvious candidates to make them take struct
intel_gtinstead of i915.Signed-off-by Paulo Zanoni <[email protected]>Co-authored-by Paulo Zanoni <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>static void
drivers/gpu/drm/i915/i915_irq.c gen11_gt_engine_identity(struct drm_i915_private * const i915, · line 3076
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +4
-2-gen11_other_irq_handler(struct drm_i915_private * const i915, - const u8 instance, const u16 iir) +gen11_other_irq_handler(struct intel_gt *gt, const u8 instance, + const u16 iir) { + struct drm_i915_private *i915 = gt->i915; +if (instance ==OTHER_GUC_INSTANCE )return gen11_guc_irq_handler (i915, iir);
That looks like a candidate for gt as well. Even for the guc, the interrupt vector is GT centric. I was hoping we could place guc/ parallel to gt/, but it looks like it will indeed be a child of intel_gt.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915: Rework some interrupt handling functions to take intel_gt
Quoted 12 lines · Chris Wilson
Quoting Tvrtko Ursulin (2019-07-02 11:23:11)
Quoted 10 lines
From: Tvrtko Ursulin <[email protected]>
Some interrupt handling functions already have gt in their names suggesting them as obvious candidates to make them take struct
intel_gtinstead of i915.Signed-off-by Paulo Zanoni <[email protected]>Co-authored-by Paulo Zanoni <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>
Quoted 14 lines
drivers/gpu/drm/i915/i915_irq.c gen11_gt_engine_identity(struct drm_i915_private * const i915, · line 3076
Quoted 10 lines
static void
drivers/gpu/drm/i915/i915_irq.c +4
-2-gen11_other_irq_handler(struct drm_i915_private * const i915, - const u8 instance, const u16 iir) +gen11_other_irq_handler(struct intel_gt *gt, const u8 instance, + const u16 iir) { + struct drm_i915_private *i915 = gt->i915; +if (instance ==OTHER_GUC_INSTANCE )return gen11_guc_irq_handler (i915, iir);That looks like a candidate for gt as well. Even for the guc, the interrupt vector is GT centric. I was hoping we could place guc/ parallel to gt/, but it looks like it will indeed be a child of
intel_gt.
Yeah. Daniele will deal with the GuC code paths.
Quoted 1 line
Reviewed-by Chris Wilson <[email protected]>
Thanks. I'll also let Daniele comment on whether this refactoring fits with his work before merging it.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniele Ceraolo Spurio
Acked-byRe: [PATCH 1/3] drm/i915: Rework some interrupt handling functions to take intel_gt
Quoted 29 lines · Tvrtko Ursulin
Quoted 12 lines · Chris Wilson
Quoting Tvrtko Ursulin (2019-07-02 11:23:11)
Quoted 10 lines
From: Tvrtko Ursulin <[email protected]>
Some interrupt handling functions already have gt in their names suggesting them as obvious candidates to make them take struct
intel_gtinstead of i915.Signed-off-by Paulo Zanoni <[email protected]>Co-authored-by Paulo Zanoni <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Quoted 14 lines
Quoted 10 lines
static void
drivers/gpu/drm/i915/i915_irq.c +2
-2-gen11_other_irq_handler(struct drm_i915_private * const i915, - const u8 instance, const u16 iir) +gen11_other_irq_handler(struct intel_gt *gt, const u8 instance, + const u16 iir){
+ structdrm_i915_private*i915 =gt->i915; +
if (instance ==OTHER_GUC_INSTANCE) returngen11_guc_irq_handler(i915, iir);That looks like a candidate for gt as well. Even for the guc, the interrupt vector is GT centric. I was hoping we could place guc/ parallel to gt/, but it looks like it will indeed be a child of
intel_gt.
Quoted 5 lines
Yeah. Daniele will deal with the GuC code paths.
Quoted 1 line
Reviewed-by Chris Wilson <[email protected]>Thanks. I'll also let Daniele comment on whether this refactoring fits with his work before merging it.
Yup, works for me. On the whole series:
Daniele
Quoted 4 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Remove some legacy mmio accessors from interrupt handling
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Mostly in gen11 interrupt handling and a couple neighbouring functions which were easy since uncore local was already available.
--- drivers/gpu/drm/i915/i915_irq.c | 75 +++++++++++++++++---------------- 1 file changed, 39 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +39 -36
@@ -3479,12 +3479,12 @@ static void vlv_display_irq_reset(struct drm_i915_private *dev_priv)struct intel_uncore *uncore = &dev_priv->uncore;if (IS_CHERRYVIEW (dev_priv)) -I915_WRITE (DPINVGTT ,DPINVGTT_STATUS_MASK_CHV ); +intel_uncore_write (uncore,DPINVGTT ,DPINVGTT_STATUS_MASK_CHV );else -I915_WRITE (DPINVGTT ,DPINVGTT_STATUS_MASK ); +intel_uncore_write (uncore,DPINVGTT ,DPINVGTT_STATUS_MASK );i915_hotplug_interrupt_update_locked (dev_priv,0xffffffff ,0 ); -I915_WRITE (PORT_HOTPLUG_STAT ,I915_READ (PORT_HOTPLUG_STAT )); +intel_uncore_write (uncore,PORT_HOTPLUG_STAT ,I915_READ (PORT_HOTPLUG_STAT ));i9xx_pipestat_irq_reset (dev_priv);
@@ -3531,11 +3531,11 @@ static void ironlake_irq_reset(struct drm_i915_private *dev_priv)GEN3_IRQ_RESET (uncore,DE );if (IS_GEN (dev_priv,7 )) -I915_WRITE (GEN7_ERR_INT ,0xffffffff ); +intel_uncore_write (uncore,GEN7_ERR_INT ,0xffffffff );if (IS_HASWELL (dev_priv)) { -I915_WRITE (EDP_PSR_IMR ,0xffffffff ); -I915_WRITE (EDP_PSR_IIR ,0xffffffff ); +intel_uncore_write (uncore,EDP_PSR_IMR ,0xffffffff ); +intel_uncore_write (uncore,EDP_PSR_IIR ,0xffffffff ); }gen5_gt_irq_reset (dev_priv);
@@ -3575,8 +3575,8 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv)gen8_gt_irq_reset (dev_priv); -I915_WRITE (EDP_PSR_IMR ,0xffffffff ); -I915_WRITE (EDP_PSR_IIR ,0xffffffff ); +intel_uncore_write (uncore,EDP_PSR_IMR ,0xffffffff ); +intel_uncore_write (uncore,EDP_PSR_IIR ,0xffffffff );for_each_pipe (dev_priv, pipe) if (intel_display_power_is_enabled(dev_priv,
@@ -3593,23 +3593,23 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv)static void gen11_gt_irq_reset (struct intel_gt *gt) { -struct drm_i915_private *dev_priv = gt->i915; +struct intel_uncore *uncore = gt->uncore;/* Disable RCS, BCS, VCS and VECS class engines. */ -I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE ,0 ); -I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE ,0 ); +intel_uncore_write (uncore,GEN11_RENDER_COPY_INTR_ENABLE ,0 ); +intel_uncore_write (uncore,GEN11_VCS_VECS_INTR_ENABLE ,0 );/* Restore masks irqs on RCS, BCS, VCS and VECS engines. */ -I915_WRITE (GEN11_RCS0_RSVD_INTR_MASK , ~0 ); -I915_WRITE (GEN11_BCS_RSVD_INTR_MASK , ~0 ); -I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~0 ); -I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~0 ); -I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~0 ); - -I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 ); -I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 ); -I915_WRITE (GEN11_GUC_SG_INTR_ENABLE ,0 ); -I915_WRITE (GEN11_GUC_SG_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_RCS0_RSVD_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_BCS_RSVD_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_VCS0_VCS1_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_VCS2_VCS3_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_VECS0_VECS1_INTR_MASK , ~0 ); + +intel_uncore_write (uncore,GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 ); +intel_uncore_write (uncore,GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_GUC_SG_INTR_ENABLE ,0 ); +intel_uncore_write (uncore,GEN11_GUC_SG_INTR_MASK , ~0 ); }static void gen11_irq_reset (struct drm_i915_private *dev_priv)
@@ -3621,10 +3621,10 @@ static void gen11_irq_reset(struct drm_i915_private *dev_priv)gen11_gt_irq_reset (&dev_priv->gt); -I915_WRITE (GEN11_DISPLAY_INT_CTL ,0 ); +intel_uncore_write (uncore,GEN11_DISPLAY_INT_CTL ,0 ); -I915_WRITE (EDP_PSR_IMR ,0xffffffff ); -I915_WRITE (EDP_PSR_IIR ,0xffffffff ); +intel_uncore_write (uncore,EDP_PSR_IMR ,0xffffffff ); +intel_uncore_write (uncore,EDP_PSR_IIR ,0xffffffff );for_each_pipe (dev_priv, pipe) if (intel_display_power_is_enabled(dev_priv,
@@ -4227,21 +4227,24 @@ static void gen8_irq_postinstall(struct drm_i915_private *dev_priv)static void gen11_gt_irq_postinstall (struct intel_gt *gt) { -struct drm_i915_private *dev_priv = gt->i915;const u32 irqs =GT_RENDER_USER_INTERRUPT |GT_CONTEXT_SWITCH_INTERRUPT ; +struct drm_i915_private *dev_priv = gt->i915; +struct intel_uncore *uncore = gt->uncore; +const u32 dmask = irqs <<16 | irqs; +const u32 smask = irqs <<16 ;BUILD_BUG_ON (irqs &0xffff0000 );/* Enable RCS, BCS, VCS and VECS class interrupts. */ -I915_WRITE (GEN11_RENDER_COPY_INTR_ENABLE , irqs <<16 | irqs); -I915_WRITE (GEN11_VCS_VECS_INTR_ENABLE , irqs <<16 | irqs); +intel_uncore_write (uncore,GEN11_RENDER_COPY_INTR_ENABLE , dmask); +intel_uncore_write (uncore,GEN11_VCS_VECS_INTR_ENABLE , dmask);/* Unmask irqs on RCS, BCS, VCS and VECS engines. */ -I915_WRITE (GEN11_RCS0_RSVD_INTR_MASK , ~(irqs <<16 )); -I915_WRITE (GEN11_BCS_RSVD_INTR_MASK , ~(irqs <<16 )); -I915_WRITE (GEN11_VCS0_VCS1_INTR_MASK , ~(irqs | irqs <<16 )); -I915_WRITE (GEN11_VCS2_VCS3_INTR_MASK , ~(irqs | irqs <<16 )); -I915_WRITE (GEN11_VECS0_VECS1_INTR_MASK , ~(irqs | irqs <<16 )); +intel_uncore_write (uncore,GEN11_RCS0_RSVD_INTR_MASK , ~smask); +intel_uncore_write (uncore,GEN11_BCS_RSVD_INTR_MASK , ~smask); +intel_uncore_write (uncore,GEN11_VCS0_VCS1_INTR_MASK , ~dmask); +intel_uncore_write (uncore,GEN11_VCS2_VCS3_INTR_MASK , ~dmask); +intel_uncore_write (uncore,GEN11_VECS0_VECS1_INTR_MASK , ~dmask);/* * RPS interrupts will get enabled/disabled on demand when RPS itself
@@ -4249,12 +4252,12 @@ static void gen11_gt_irq_postinstall(struct intel_gt *gt)*/ dev_priv->pm_ier =0x0 ; dev_priv->pm_imr = ~dev_priv->pm_ier; -I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 ); -I915_WRITE (GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 ); +intel_uncore_write (uncore,GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 );/* Same thing for GuC interrupts */ -I915_WRITE (GEN11_GUC_SG_INTR_ENABLE ,0 ); -I915_WRITE (GEN11_GUC_SG_INTR_MASK , ~0 ); +intel_uncore_write (uncore,GEN11_GUC_SG_INTR_ENABLE ,0 ); +intel_uncore_write (uncore,GEN11_GUC_SG_INTR_MASK , ~0 ); }static void icp_irq_postinstall (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915: Remove some legacy mmio accessors from interrupt handling
Quoting Tvrtko Ursulin (2019-07-02 11:23:12)
Quoted 9 lines
From: Tvrtko Ursulin <[email protected]>
Mostly in gen11 interrupt handling and a couple neighbouring functions which were easy since uncore local was already available.
Co-authored-by Paulo Zanoni <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>
Makes sense to me,
but I'm wary that this is too little of a drop in a churning ocean. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Move dev_priv->pm_i{m, e}r into intel_gt
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
PM interrupts belong to the GT so move the variables to be inside struct intel_gt.
--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 121 +++++++++++---------- drivers/gpu/drm/i915/i915_irq.h | 4 +- 5 files changed, 71 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -0
@@ -55,6 +55,9 @@ struct intel_gt {ktime_t last_init_time;struct i915_vma *scratch; + +u32 pm_imr; + u32 pm_ier; };#endif /* __INTEL_GT_TYPES_H__ */
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +2 -2
@@ -1041,14 +1041,14 @@ hsw_vebox_irq_enable(struct intel_engine_cs *engine)/* Flush/delay to ensure the RING_IMR is active before the GT IMR */ ENGINE_POSTING_READ (engine,RING_IMR ); -gen6_unmask_pm_irq (engine->i915, engine->irq_enable_mask); +gen6_unmask_pm_irq (engine->gt, engine->irq_enable_mask); }static void hsw_vebox_irq_disable (struct intel_engine_cs *engine) {ENGINE_WRITE (engine,RING_IMR , ~0 ); -gen6_mask_pm_irq (engine->i915, engine->irq_enable_mask); +gen6_mask_pm_irq (engine->gt, engine->irq_enable_mask); } static int
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -1403,8 +1403,6 @@ struct drm_i915_private {u32 de_irq_mask[I915_MAX_PIPES ]; };u32 gt_irq_mask; -u32 pm_imr; -u32 pm_ier;u32 pm_rps_events;u32 pm_guc_events;u32 pipestat_irq_mask[I915_MAX_PIPES ];
drivers/gpu/drm/i915/i915_irq.c +64 -57
299 lines not on this page · raw message
drivers/gpu/drm/i915/i915_irq.h +2 -2
@@ -77,8 +77,8 @@ ibx_disable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)void gen5_enable_gt_irq (struct drm_i915_private *dev_priv,u32 mask);void gen5_disable_gt_irq (struct drm_i915_private *dev_priv,u32 mask); -void gen6_mask_pm_irq (struct drm_i915_private *dev_priv,u32 mask); -void gen6_unmask_pm_irq (struct drm_i915_private *dev_priv,u32 mask); +void gen6_mask_pm_irq (struct intel_gt *gt,u32 mask); +void gen6_unmask_pm_irq (struct intel_gt *gt,u32 mask);void gen11_reset_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_reset_rps_interrupts (struct drm_i915_private *dev_priv);void gen6_enable_rps_interrupts (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: Move dev_priv->pm_i{m, e}r into intel_gt
Quoting Tvrtko Ursulin (2019-07-02 11:23:13)
Quoted 4 lines
From: Tvrtko Ursulin <[email protected]>
PM interrupts belong to the GT so move the variables to be inside struct
intel_gt.
I even had gt_pm patches kicking around :-p
Which are in desperate need of revival. :-(
Quoted 5 lines
Co-authored-by Paulo Zanoni <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Andi Shyti <[email protected]>
Quoted 13 lines
--- drivers/gpu/drm/i915/gt/intel_gt_types.h | 3 + drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 121 +++++++++++---------- drivers/gpu/drm/i915/i915_irq.h | 4 +- 5 files changed, 71 insertions(+), 63 deletions(-)drivers/gpu/drm/i915/gt/intel_gt_types.h +0
-0
drivers/gpu/drm/i915/gt/intel_gt_types.h struct intel_gt { · line 60
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-0@@ -55,6 +55,9 @@ struct intel_gt {ktime_t last_init_time;struct i915_vma *scratch; + +u32 pm_imr; +u32 pm_ier;
Fwiw, I do intend to bring back gt_pm and move all the rps/ips tracking underneath it and extract it from i915_irq.c & intel_pm.c into gt/
We have a long standing bugs in race conditions between the pm interrupts and the rps worker, plus overdue work to let userspace make fine grained suggestions for frequency/power control. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for More mmio and intel_gt cleanups and refactorings
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: More mmio and intel_gt cleanups and refactorings
URL : https://patchwork.freedesktop.org/series/63063/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a59370ad3ca8 drm/i915: Rework some interrupt handling functions to take intel_gt -:12: WARNING:BAD_SIGN_OFF: Non-standard signature: Co-authored-by: #12: Co-authored-by: Paulo Zanoni <[email protected]>
total: 0 errors, 1 warnings, 0 checks, 269 lines checked 7ca251537529 drm/i915: Remove some legacy mmio accessors from interrupt handling -:10: WARNING:BAD_SIGN_OFF: Non-standard signature: Co-authored-by:
#10:
total: 0 errors, 1 warnings, 0 checks, 136 lines checked 359a181398e4 drm/i915: Move dev_priv->pm_i{m, e}r into intel_gt -:9: WARNING:BAD_SIGN_OFF: Non-standard signature: Co-authored-by:
#9:
total: 0 errors, 1 warnings, 0 checks, 342 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.CHECKPATCH: warning for More mmio and intel_gt cleanups and refactorings
Quoting Patchwork (2019-07-02 11:46:48)
Quoted 6 lines
== Series Details ==
Series: More mmio and
intel_gtcleanups and refactorings
URL : https://patchwork.freedesktop.org/series/63063/
State : warning
Quoted 7 lines
== Summary ==
$ dim checkpatch origin/drm-tip a59370ad3ca8 drm/i915: Rework some interrupt handling functions to take intel_gt -:12: WARNING:BAD_SIGN_OFF: Non-standard signature: Co-authored-by: #12: Co-authored-by: Paulo Zanoni <[email protected]>
Approved tag is "Co-developed-by"
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for More mmio and intel_gt cleanups and refactorings
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: More mmio and intel_gt cleanups and refactorings
URL : https://patchwork.freedesktop.org/series/63063/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6394 -> Patchwork_13488
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13488 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_13488, 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_13488/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13488:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_contexts:
- fi-skl-gvtdvm: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-skl-gvtdvm/igt@i915_selftest@live_contexts.html
Known issues
------------
Here are the changes found in Patchwork_13488 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_blt:
- fi-skl-iommu: [PASS][2] -> [INCOMPLETE][3] ([fdo#108602])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-skl-iommu/igt@i915_selftest@live_blt.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-skl-iommu/igt@i915_selftest@live_blt.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][4] -> [DMESG-WARN][5] ([fdo#102614])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-hsw-peppy/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-hsw-peppy/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-icl-u3: [PASS][6] -> [DMESG-WARN][7] ([fdo#107724]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-icl-u3/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-icl-u3/igt@[email protected]
#### Possible fixes ####
* igt@gem_mmap_gtt@basic-small-bo-tiledy:
- fi-icl-u3: [DMESG-WARN][8] ([fdo#107724]) -> [PASS][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-icl-u3/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-icl-u3/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-skl-6600u: [DMESG-WARN][10] ([fdo#111012]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-skl-6600u/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-skl-6600u/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-cfl-guc: [DMESG-WARN][12] ([fdo#110943]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-cfl-guc/igt@i915_selftest@live_blt.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-cfl-guc/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_hugepages:
- fi-skl-gvtdvm: [DMESG-WARN][14] ([fdo#110976]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-skl-gvtdvm/igt@i915_selftest@live_hugepages.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-skl-gvtdvm/igt@i915_selftest@live_hugepages.html
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: [DMESG-WARN][16] ([fdo#106387]) -> [PASS][17] +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-ilk-650/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-ilk-650/igt@[email protected]
#### Warnings ####
* igt@i915_module_load@reload:
- fi-icl-u2: [DMESG-WARN][18] ([fdo#111041]) -> [DMESG-WARN][19] ([fdo#110595]) +2 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6394/fi-icl-u2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/fi-icl-u2/igt@[email protected]
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#110595]: https://bugs.freedesktop.org/show_bug.cgi?id=110595
[fdo#110943]: https://bugs.freedesktop.org/show_bug.cgi?id=110943
[fdo#110976]: https://bugs.freedesktop.org/show_bug.cgi?id=110976
[fdo#111012]: https://bugs.freedesktop.org/show_bug.cgi?id=111012
[fdo#111041]: https://bugs.freedesktop.org/show_bug.cgi?id=111041
Participating hosts (50 -> 44)
------------------------------
Additional (2): fi-icl-guc fi-cml-u
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bdw-gvtdvm fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_6394 -> Patchwork_13488
CI_DRM_6394: ad42b755acd3c10f7a8e23309189f0a850ec92c5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5075: 03779dd3de8a57544f124d9952a6d2b3e34e34ca @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13488: 359a181398e4276615186394fe956b357f80cada @ git://anongit.freedesktop.org/gfx-ci/linux
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/build_32bit.log
CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 112 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed make[1]: *** [__modpost] Error 1
Makefile:1287: recipe for target 'modules' failed
make: *** [modules] Error 2
== Linux commits ==
359a181398e4 drm/i915: Move dev_priv->pm_i{m, e}r into intel_gt 7ca251537529 drm/i915: Remove some legacy mmio accessors from interrupt handling a59370ad3ca8 drm/i915: Rework some interrupt handling functions to take intel_gt
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13488/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for More mmio and intel_gt cleanups and refactorings (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: More mmio and intel_gt cleanups and refactorings (rev2)
URL : https://patchwork.freedesktop.org/series/63063/
State : failure
== Summary ==
Patch format detection failed.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx