Skip to content

Commit 8598eb7

Browse files
mattroperodrigovivi
authored andcommitted
drm/i915: Use proper fault mask in interrupt postinstall too
The IRQ postinstall handling had open-coded pipe fault mask selection that never got updated for gen11. Switch it to use gen8_de_pipe_fault_mask() to ensure we don't miss updates for new platforms. Cc: José Roberto de Souza <[email protected]> Fixes: d506a65 ("drm/i915: Catch GTT fault errors for gen11+ planes") Signed-off-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Ville Syrjälä <[email protected]> (cherry picked from commit 869129e) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 2abaad4 commit 8598eb7

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gpu/drm/i915/i915_irq.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3358,7 +3358,8 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
33583358
{
33593359
struct intel_uncore *uncore = &dev_priv->uncore;
33603360

3361-
u32 de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE;
3361+
u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
3362+
GEN8_PIPE_CDCLK_CRC_DONE;
33623363
u32 de_pipe_enables;
33633364
u32 de_port_masked = GEN8_AUX_CHANNEL_A;
33643365
u32 de_port_enables;
@@ -3369,13 +3370,10 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
33693370
de_misc_masked |= GEN8_DE_MISC_GSE;
33703371

33713372
if (INTEL_GEN(dev_priv) >= 9) {
3372-
de_pipe_masked |= GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
33733373
de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
33743374
GEN9_AUX_CHANNEL_D;
33753375
if (IS_GEN9_LP(dev_priv))
33763376
de_port_masked |= BXT_DE_PORT_GMBUS;
3377-
} else {
3378-
de_pipe_masked |= GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
33793377
}
33803378

33813379
if (INTEL_GEN(dev_priv) >= 11)

0 commit comments

Comments
 (0)