Skip to content

Commit 382ae02

Browse files
committed
at Linux version 5.6.11
1 parent 90cf590 commit 382ae02

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

sys/external/bsd/drm2/dist/drm/i915/i915_irq.c

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

3339-
u32 de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE;
3339+
u32 de_pipe_masked = gen8_de_pipe_fault_mask(dev_priv) |
3340+
GEN8_PIPE_CDCLK_CRC_DONE;
33403341
u32 de_pipe_enables;
33413342
u32 de_port_masked = GEN8_AUX_CHANNEL_A;
33423343
u32 de_port_enables;
@@ -3347,13 +3348,10 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
33473348
de_misc_masked |= GEN8_DE_MISC_GSE;
33483349

33493350
if (INTEL_GEN(dev_priv) >= 9) {
3350-
de_pipe_masked |= GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
33513351
de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
33523352
GEN9_AUX_CHANNEL_D;
33533353
if (IS_GEN9_LP(dev_priv))
33543354
de_port_masked |= BXT_DE_PORT_GMBUS;
3355-
} else {
3356-
de_pipe_masked |= GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
33573355
}
33583356

33593357
if (INTEL_GEN(dev_priv) >= 11)

0 commit comments

Comments
 (0)