Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued

[linux-2.6-block.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index d94c92d842fb9edfc0549257ea1fafb67aa1a820..8485bea966ccbacdbb18ae392cb1bd6f6a4fb03f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -97,6 +97,7 @@ static const u32 hpd_status_i915[HPD_NUM_PINS] = {
 
 /* BXT hpd list */
 static const u32 hpd_bxt[HPD_NUM_PINS] = {
+       [HPD_PORT_A] = BXT_DE_PORT_HP_DDIA,
        [HPD_PORT_B] = BXT_DE_PORT_HP_DDIB,
        [HPD_PORT_C] = BXT_DE_PORT_HP_DDIC
 };
@@ -3054,30 +3055,25 @@ static void bxt_hpd_irq_setup(struct drm_device *dev)
        u32 hotplug_port = 0;
        u32 hotplug_ctrl;
 
-       /* Now, enable HPD */
        for_each_intel_encoder(dev, intel_encoder) {
                if (dev_priv->hotplug.stats[intel_encoder->hpd_pin].state
                                == HPD_ENABLED)
                        hotplug_port |= hpd_bxt[intel_encoder->hpd_pin];
        }
 
-       /* Mask all HPD control bits */
        hotplug_ctrl = I915_READ(BXT_HOTPLUG_CTL) & ~BXT_HOTPLUG_CTL_MASK;
 
-       /* Enable requested port in hotplug control */
-       /* TODO: implement (short) HPD support on port A */
-       WARN_ON_ONCE(hotplug_port & BXT_DE_PORT_HP_DDIA);
+       if (hotplug_port & BXT_DE_PORT_HP_DDIA)
+               hotplug_ctrl |= BXT_DDIA_HPD_ENABLE;
        if (hotplug_port & BXT_DE_PORT_HP_DDIB)
                hotplug_ctrl |= BXT_DDIB_HPD_ENABLE;
        if (hotplug_port & BXT_DE_PORT_HP_DDIC)
                hotplug_ctrl |= BXT_DDIC_HPD_ENABLE;
        I915_WRITE(BXT_HOTPLUG_CTL, hotplug_ctrl);
 
-       /* Unmask DDI hotplug in IMR */
        hotplug_ctrl = I915_READ(GEN8_DE_PORT_IMR) & ~hotplug_port;
        I915_WRITE(GEN8_DE_PORT_IMR, hotplug_ctrl);
 
-       /* Enable DDI hotplug in IER */
        hotplug_ctrl = I915_READ(GEN8_DE_PORT_IER) | hotplug_port;
        I915_WRITE(GEN8_DE_PORT_IER, hotplug_ctrl);
        POSTING_READ(GEN8_DE_PORT_IER);