drm/i915: Initialize pm_intr_keep during intel_irq_init for GuC
Subsystems (2)
PATCH 1/1 drm/i915: Initialize pm_intr_keep during intel_irq_init for GuC
Driver needs to ensure that it doesn't mask the PM interrupts, which are unmasked/needed by GuC firmware. For that, Driver maintains a bitmask of interrupts to be kept unmasked, pm_intr_keep.
pm_intr_keep was determined across GuC load. GuC gets loaded in different scenarios and it is not going to change the pm_intr_keep so this patch moves its setup to intel_irq_init.
This patch fixes incorrect RPS masking leading to UP interrupts triggered even when at cur_freq=max and inversly for Down interrupts.
--- drivers/gpu/drm/i915/i915_irq.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 3 ++- drivers/gpu/drm/i915/intel_guc_loader.c | 26 -------------------------- 3 files changed, 26 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +24 -0
@@ -4301,6 +4301,30 @@ void intel_irq_init(struct drm_i915_private *dev_priv)if (INTEL_INFO (dev_priv)->gen >=8 ) dev_priv->rps.pm_intr_keep |=GEN8_PMINTR_REDIRECT_TO_GUC ; +/* +* The REDIRECT_TO_GUC bit of the PMINTRMSK register directs all +* (unmasked) PM interrupts to the GuC. All other bits of this +* register *disable* generation of a specific interrupt. +* +* 'pm_intr_keep' indicates bits that are NOT to be set when +* writing to the PM interrupt mask register, i.e. interrupts +* that must not be disabled. +* +* If the GuC is handling these interrupts, then we must not let +* the PM code disable ANY interrupt that the GuC is expecting. +* So for each ENABLED (0) bit in this register, we must SET the +* bit in pm_intr_keep so that it's left enabled for the GuC. +* GuC needs ARAT expired interrupt unmasked hence it is set in +* pm_intr_keep. +* +* Here we CLEAR REDIRECT_TO_GUC bit in pm_intr_keep, which will +* result in the register bit being left SET! +*/ +if (HAS_GUC_SCHED (dev_priv)) { + dev_priv->rps.pm_intr_keep |=ARAT_EXPIRED_INTRMSK ; + dev_priv->rps.pm_intr_keep &= ~GEN8_PMINTR_REDIRECT_TO_GUC ; + } +if (IS_GEN2 (dev_priv)) {/* Gen2 doesn't have a hardware frame counter */ dev->max_vblank_count =0 ;
drivers/gpu/drm/i915/i915_reg.h +2 -1
@@ -7453,7 +7453,8 @@ enum {#define VLV_RCEDATA _MMIO(0xA0BC)#define GEN6_RC6pp_THRESHOLD _MMIO(0xA0C0)#define GEN6_PMINTRMSK _MMIO(0xA168) -#define GEN8_PMINTR_REDIRECT_TO_GUC (1<<31) +#define GEN8_PMINTR_REDIRECT_TO_GUC (1<<31) +#define ARAT_EXPIRED_INTRMSK (1<<9)#define GEN8_MISC_CTRL0 _MMIO(0xA180)#define VLV_PWRDWNUPCTL _MMIO(0xA294)#define GEN9_MEDIA_PG_IDLE_HYSTERESIS _MMIO(0xA0C4)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -26
@@ -114,7 +114,6 @@ static void guc_interrupts_capture(struct drm_i915_private *dev_priv)struct intel_engine_cs *engine;enum intel_engine_id id;int irqs; -u32 tmp;/* tell all command streamers to forward interrupts (but not vblank) to GuC */ irqs =_MASKED_BIT_ENABLE (GFX_INTERRUPT_STEERING );
@@ -128,31 +127,6 @@ static void guc_interrupts_capture(struct drm_i915_private *dev_priv)I915_WRITE (GUC_BCS_RCS_IER , ~irqs);I915_WRITE (GUC_VCS2_VCS1_IER , ~irqs);I915_WRITE (GUC_WD_VECS_IER , ~irqs); - -/* -* The REDIRECT_TO_GUC bit of the PMINTRMSK register directs all -* (unmasked) PM interrupts to the GuC. All other bits of this -* register *disable* generation of a specific interrupt. -* -* 'pm_intr_keep' indicates bits that are NOT to be set when -* writing to the PM interrupt mask register, i.e. interrupts -* that must not be disabled. -* -* If the GuC is handling these interrupts, then we must not let -* the PM code disable ANY interrupt that the GuC is expecting. -* So for each ENABLED (0) bit in this register, we must SET the -* bit in pm_intr_keep so that it's left enabled for the GuC. -* -* OTOH the REDIRECT_TO_GUC bit is initially SET in pm_intr_keep -* (so interrupts go to the DISPLAY unit at first); but here we -* need to CLEAR that bit, which will result in the register bit -* being left SET! -*/ - tmp =I915_READ (GEN6_PMINTRMSK ); -if (tmp &GEN8_PMINTR_REDIRECT_TO_GUC ) { - dev_priv->rps.pm_intr_keep |= ~tmp; - dev_priv->rps.pm_intr_keep &= ~GEN8_PMINTR_REDIRECT_TO_GUC ; - } }static u32 get_gttype (struct drm_i915_private *dev_priv)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/1] drm/i915: Initialize pm_intr_keep during intel_irq_init for GuC
== Series Details ==
== Series Details ==
Series: series starting with [1/1] drm/i915: Initialize pm_intr_keep during intel_irq_init for GuC
URL : https://patchwork.freedesktop.org/series/20812/
State : success
== Summary ==
Series 20812v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/20812/revisions/1/mbox/
Test drv_module_reload:
Subgroup basic-no-display:
incomplete -> PASS (fi-hsw-4770r)
Test kms_cursor_legacy:
Subgroup basic-flip-before-cursor-varying-size:
dmesg-warn -> PASS (fi-byt-n2820)fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 470s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 628s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 536s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 605s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 509s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 499s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 441s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 437s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 445s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 511s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 491s fi-kbl-7500u total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time: 478s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 514s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 607s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 497s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 542s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 553s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 424s
1e8ad06b985178ccd08c175dee3e650d6734f3d1 drm-tip: 2017y-03m-06d-23h-42m-09s UTC integration manifest 49e5e21 drm/i915: Initialize pm_intr_keep during intel_irq_init for GuC
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4078/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Sagar Arun Kamble
Driver needs to ensure that it doesn't mask the PM interrupts, which are unmasked/needed by GuC firmware. For that, Driver maintains a bitmask of interrupts to be kept unmasked,
pm_intr_keep.
pm_intr_keepwas determined across GuC load. GuC gets loaded in different scenarios and it is not going to change thepm_intr_keepso this patch moves its setup tointel_irq_init.This patch fixes incorrect RPS masking leading to UP interrupts triggered even when at cur_freq=max and inversly for Down interrupts.
Quoted 7 lines
Cc Radoslaw Szwichtenberg <[email protected]>Cc Arkadiusz Hiler <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Michal Winiarski <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Signed-off-by Sagar Arun Kamble <[email protected]>Reviewed-by Chris Wilson <[email protected]>
CI is having issues with guc on bxt, but pushed. Thanks, -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx