|
|
@@ -2244,6 +2244,11 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
|
|
|
found = true;
|
|
|
}
|
|
|
|
|
|
+ if (IS_BROXTON(dev) && (tmp & BXT_DE_PORT_GMBUS)) {
|
|
|
+ gmbus_irq_handler(dev);
|
|
|
+ found = true;
|
|
|
+ }
|
|
|
+
|
|
|
if (!found)
|
|
|
DRM_ERROR("Unexpected DE Port interrupt\n");
|
|
|
}
|
|
|
@@ -3515,13 +3520,16 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
|
|
|
uint32_t de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE;
|
|
|
uint32_t de_pipe_enables;
|
|
|
int pipe;
|
|
|
- u32 aux_en = GEN8_AUX_CHANNEL_A;
|
|
|
+ u32 de_port_en = GEN8_AUX_CHANNEL_A;
|
|
|
|
|
|
if (IS_GEN9(dev_priv)) {
|
|
|
de_pipe_masked |= GEN9_PIPE_PLANE1_FLIP_DONE |
|
|
|
GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
|
|
|
- aux_en |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
|
|
|
+ de_port_en |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
|
|
|
GEN9_AUX_CHANNEL_D;
|
|
|
+
|
|
|
+ if (IS_BROXTON(dev_priv))
|
|
|
+ de_port_en |= BXT_DE_PORT_GMBUS;
|
|
|
} else
|
|
|
de_pipe_masked |= GEN8_PIPE_PRIMARY_FLIP_DONE |
|
|
|
GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
|
|
|
@@ -3540,7 +3548,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
|
|
|
dev_priv->de_irq_mask[pipe],
|
|
|
de_pipe_enables);
|
|
|
|
|
|
- GEN5_IRQ_INIT(GEN8_DE_PORT_, ~aux_en, aux_en);
|
|
|
+ GEN5_IRQ_INIT(GEN8_DE_PORT_, ~de_port_en, de_port_en);
|
|
|
}
|
|
|
|
|
|
static int gen8_irq_postinstall(struct drm_device *dev)
|