drm/i915: move rps irq enable/disable to i915_irq.c
Subsystems (2)
PATCH 4/8 drm/i915: move rps irq enable/disable to i915_irq.c
The logical place for these functions is in i915_irq.c next to the rest of PM interrupt handling functions.
No functional change.
--- drivers/gpu/drm/i915/i915_irq.c | 43 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_pm.c | 41 -------------------------------------- 3 files changed, 45 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +43 -0
@@ -138,6 +138,8 @@ static const u32 hpd_status_i915[] = { /* i915 and valleyview are the same */ POSTING_READ(type##IMR); \ } while (0) +static void gen6_rps_irq_handler (struct drm_i915_private *dev_priv,u32 pm_iir); +/* For display hotplug interrupt */ void ironlake_enable_display_irq (struct drm_i915_private *dev_priv,u32 mask)
@@ -200,11 +202,21 @@ void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask)ilk_update_gt_irq (dev_priv, mask,0 ); } +static u32 gen6_pm_iir (struct drm_i915_private *dev_priv) +{ +return INTEL_INFO (dev_priv)->gen >=8 ?GEN8_GT_IIR (2 ) :GEN6_PMIIR ; +} +static u32 gen6_pm_imr (struct drm_i915_private *dev_priv) {return INTEL_INFO (dev_priv)->gen >=8 ?GEN8_GT_IMR (2 ) :GEN6_PMIMR ; } +static u32 gen6_pm_ier (struct drm_i915_private *dev_priv) +{ +return INTEL_INFO (dev_priv)->gen >=8 ?GEN8_GT_IER (2 ) :GEN6_PMIER ; +} +/** * snb_update_pm_irq - update GEN6_PMIMR * @dev_priv: driver private
@@ -243,6 +255,37 @@ void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask)snb_update_pm_irq (dev_priv, mask,0 ); } +void gen6_enable_rps_interrupts (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + +spin_lock_irq (&dev_priv->irq_lock); +WARN_ON (dev_priv->rps.pm_iir); +gen6_enable_pm_irq (dev_priv, dev_priv->pm_rps_events); +I915_WRITE (gen6_pm_iir (dev_priv), dev_priv->pm_rps_events); +spin_unlock_irq (&dev_priv->irq_lock); +} + +void gen6_disable_rps_interrupts (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; + +I915_WRITE (GEN6_PMINTRMSK ,INTEL_INFO (dev_priv)->gen >=8 ? + ~GEN8_PMINTR_REDIRECT_TO_NON_DISP : ~0 ); +I915_WRITE (gen6_pm_ier (dev_priv),I915_READ (gen6_pm_ier (dev_priv)) & + ~dev_priv->pm_rps_events); +/* Complete PM interrupt masking here doesn't race with the rps work +* item again unmasking PM interrupts because that is using a different +* register (PMIMR) to mask PM interrupts. The only risk is in leaving +* stale bits in PMIIR and PMIMR which gen6_enable_rps will clean up. */ + +spin_lock_irq (&dev_priv->irq_lock); + dev_priv->rps.pm_iir =0 ; +spin_unlock_irq (&dev_priv->irq_lock); + +I915_WRITE (gen6_pm_iir (dev_priv), dev_priv->pm_rps_events); +} +/** * ibx_display_interrupt_update - update SDEIMR * @dev_priv: driver private
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -791,6 +791,8 @@ void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask);void gen5_disable_gt_irq (struct drm_i915_private *dev_priv,uint32_t mask);void gen6_enable_pm_irq (struct drm_i915_private *dev_priv,uint32_t mask);void gen6_disable_pm_irq (struct drm_i915_private *dev_priv,uint32_t mask); +void gen6_enable_rps_interrupts (struct drm_device *dev); +void gen6_disable_rps_interrupts (struct drm_device *dev);void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv);void intel_runtime_pm_enable_interrupts (struct drm_i915_private *dev_priv);static inline bool intel_irqs_enabled (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_pm.c +0 -41
59 lines not on this page · raw message
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: WARN if we receive any gen9 rps interrupts
Paulo noticed that we don't support RPS on GEN9 yet, so WARN for and ignore any RPS interrupts on that platform.
--- drivers/gpu/drm/i915/i915_irq.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_irq.c +5 -0
@@ -1690,6 +1690,11 @@ static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)* the work queue. */ static void gen6_rps_irq_handler (struct drm_i915_private *dev_priv,u32 pm_iir) { +/* TODO: RPS on GEN9 is not supported yet. */ +if (WARN_ONCE (INTEL_INFO (dev_priv)->gen ==9 , +"GEN9: unexpected RPS IRQ\n" )) +return ; +if (pm_iir & dev_priv->pm_rps_events) {spin_lock (&dev_priv->irq_lock); dev_priv->rps.pm_iir |= pm_iir & dev_priv->pm_rps_events;
Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4.1] drm/i915: WARN if we receive any gen9 rps
-------------------------------------Summary-------------------------------------
Platform: baseline_drm_intel_nightly_pass_rate->patch_applied_pass_rate
BYT: pass/total=277/348->277/348
PNV: pass/total=323/328->326/328
ILK: pass/total=328/330->330/330
IVB: pass/total=545/546->545/546
SNB: pass/total=558/563->559/563
HSW: pass/total=574/578->572/578
BDW: pass/total=435/435->434/435
-------------------------------------Detailed-------------------------------------test_platform: test_suite, test_case, result_with_drm_intel_nightly(count, machine_id...)...->result_with_patch_applied(count, machine_id)...
PNV: Intel_gpu_tools, igt_gem_linear_blits_normal, NSPT(1, M23)PASS(6, M24) -> PASS(4, M24)
PNV: Intel_gpu_tools, igt_gem_mmap_offset_exhaustion, DMESG_WARN(2, M23M24)PASS(14, M24M23M7) -> DMESG_WARN(1, M24)PASS(3, M24)
PNV: Intel_gpu_tools, igt_gem_unref_active_buffers, DMESG_WARN(2, M23)PASS(14, M24M23M7) -> PASS(4, M24)
ILK: Intel_gpu_tools, igt_kms_render_gpu-blit, DMESG_WARN(1, M26)PASS(15, M6M26M37) -> PASS(4, M37)
ILK: Intel_gpu_tools, igt_kms_flip_wf_vblank-vs-dpms-interruptible, DMESG_WARN(1, M26)PASS(15, M6M26M37) -> PASS(4, M37)
IVB: Intel_gpu_tools, igt_gem_bad_reloc_negative-reloc, NSPT(3, M4M34)PASS(7, M34M4) -> NSPT(2, M4)PASS(2, M4)
IVB: Intel_gpu_tools, igt_kms_plane_plane-position-covered-pipe-A-plane-1, TIMEOUT(1, M34)PASS(6, M4) -> PASS(4, M4)
SNB: Intel_gpu_tools, igt_kms_cursor_crc_cursor-256x256-sliding, DMESG_WARN(2, M35)PASS(5, M22M35) -> DMESG_WARN(1, M35)PASS(3, M35)
HSW: Intel_gpu_tools, igt_gem_bad_reloc_negative-reloc, NSPT(4, M39M20M40)PASS(9, M40M39M20) -> NSPT(2, M40)PASS(2, M40)
HSW: Intel_gpu_tools, igt_kms_cursor_crc_cursor-64x64-offscreen, DMESG_WARN(1, M39)PASS(6, M40M39) -> DMESG_WARN(1, M40)PASS(3, M40)
BDW: Intel_gpu_tools, igt_gem_reset_stats_ban-bsd, PASS(16, M30M28M42) -> DMESG_WARN(1, M28)PASS(3, M28)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4.1] drm/i915: WARN if we receive any gen9 rps interrupts
In reply to Imre DeakQuoted 4 lines · Imre Deak
Paulo noticed that we don't support RPS on GEN9 yet, so WARN for and ignore any RPS interrupts on that platform.
Signed-off-by Imre Deak <[email protected]>
Pulled in up to this one from this series, I'll wait for Paulo to double-check the new versions of the subsequent patches.
Thanks, Daniel
Quoted 27 lines
--- drivers/gpu/drm/i915/i915_irq.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/i915_irq.c +5
-0@@ -1690,6 +1690,11 @@ static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)* the work queue. */ static void gen6_rps_irq_handler (struct drm_i915_private *dev_priv,u32 pm_iir) { +/* TODO: RPS on GEN9 is not supported yet. */ +if (WARN_ONCE (INTEL_INFO (dev_priv)->gen ==9 , +"GEN9: unexpected RPS IRQ\n" )) +return ; +if (pm_iir & dev_priv->pm_rps_events) {spin_lock (&dev_priv->irq_lock); dev_priv->rps.pm_iir |= pm_iir & dev_priv->pm_rps_events;Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx