drm/i915: Enable edp psr error interrupts on bdw+

Plug in the bdw+ irq handling for PSR interrupts. bdw+ supports psr on
any transcoder in theory, though the we don't currenty enable PSR except
on the EDP transcoder.

v2: From DK
 * Rebased on drm-tip
v3: Switched author to Ville based on IRC discussion.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Jose Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180403212420.25007-2-dhinakaran.pandiyan@intel.com

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 630fc6f..ab9aac8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2455,20 +2455,34 @@ static void ilk_display_irq_handler(struct drm_i915_private *dev_priv,
 static void hsw_edp_psr_irq_handler(struct drm_i915_private *dev_priv)
 {
        u32 edp_psr_iir = I915_READ(EDP_PSR_IIR);
+       u32 edp_psr_imr = I915_READ(EDP_PSR_IMR);
+       u32 mask = BIT(TRANSCODER_EDP);
+       enum transcoder cpu_transcoder;
 
-       if (edp_psr_iir & EDP_PSR_ERROR)
-               DRM_DEBUG_KMS("PSR error\n");
-
-       if (edp_psr_iir & EDP_PSR_PRE_ENTRY) {
-               DRM_DEBUG_KMS("PSR prepare entry in 2 vblanks\n");
-               I915_WRITE(EDP_PSR_IMR, EDP_PSR_PRE_ENTRY);
-       }
+       if (INTEL_GEN(dev_priv) >= 8)
+               mask |= BIT(TRANSCODER_A) |
+                       BIT(TRANSCODER_B) |
+                       BIT(TRANSCODER_C);
+
+       for_each_cpu_transcoder_masked(dev_priv, cpu_transcoder, mask) {
+               if (edp_psr_iir & EDP_PSR_ERROR(cpu_transcoder))
+                       DRM_DEBUG_KMS("Transcoder %s PSR error\n",
+                                     transcoder_name(cpu_transcoder));
+
+               if (edp_psr_iir & EDP_PSR_PRE_ENTRY(cpu_transcoder)) {
+                       DRM_DEBUG_KMS("Transcoder %s PSR prepare entry in 2 vblanks\n",
+                                     transcoder_name(cpu_transcoder));
+                       edp_psr_imr |= EDP_PSR_PRE_ENTRY(cpu_transcoder);
+               }
 
-       if (edp_psr_iir & EDP_PSR_POST_EXIT) {
-               DRM_DEBUG_KMS("PSR exit completed\n");
-               I915_WRITE(EDP_PSR_IMR, 0);
+               if (edp_psr_iir & EDP_PSR_POST_EXIT(cpu_transcoder)) {
+                       DRM_DEBUG_KMS("Transcoder %s PSR exit completed\n",
+                                     transcoder_name(cpu_transcoder));
+                       edp_psr_imr &= ~EDP_PSR_PRE_ENTRY(cpu_transcoder);
+               }
        }
 
+       I915_WRITE(EDP_PSR_IMR, edp_psr_imr);
        I915_WRITE(EDP_PSR_IIR, edp_psr_iir);
 }
 
@@ -2616,11 +2630,22 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
        if (master_ctl & GEN8_DE_MISC_IRQ) {
                iir = I915_READ(GEN8_DE_MISC_IIR);
                if (iir) {
+                       bool found = false;
+
                        I915_WRITE(GEN8_DE_MISC_IIR, iir);
                        ret = IRQ_HANDLED;
-                       if (iir & GEN8_DE_MISC_GSE)
+
+                       if (iir & GEN8_DE_MISC_GSE) {
                                intel_opregion_asle_intr(dev_priv);
-                       else
+                               found = true;
+                       }
+
+                       if (iir & GEN8_DE_EDP_PSR) {
+                               hsw_edp_psr_irq_handler(dev_priv);
+                               found = true;
+                       }
+
+                       if (!found)
                                DRM_ERROR("Unexpected DE Misc interrupt\n");
                }
                else
@@ -3414,6 +3439,9 @@ static void gen8_irq_reset(struct drm_device *dev)
 
        gen8_gt_irq_reset(dev_priv);
 
+       I915_WRITE(EDP_PSR_IMR, 0xffffffff);
+       I915_WRITE(EDP_PSR_IIR, 0xffffffff);
+
        for_each_pipe(dev_priv, pipe)
                if (intel_display_power_is_enabled(dev_priv,
                                                   POWER_DOMAIN_PIPE(pipe)))
@@ -3906,7 +3934,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
        uint32_t de_pipe_enables;
        u32 de_port_masked = GEN8_AUX_CHANNEL_A;
        u32 de_port_enables;
-       u32 de_misc_masked = GEN8_DE_MISC_GSE;
+       u32 de_misc_masked = GEN8_DE_MISC_GSE | GEN8_DE_EDP_PSR;
        enum pipe pipe;
 
        if (INTEL_GEN(dev_priv) >= 9) {
@@ -3931,6 +3959,9 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
        else if (IS_BROADWELL(dev_priv))
                de_port_enables |= GEN8_PORT_DP_A_HOTPLUG;
 
+       gen3_assert_iir_is_zero(dev_priv, EDP_PSR_IIR);
+       I915_WRITE(EDP_PSR_IMR, 0);
+
        for_each_pipe(dev_priv, pipe) {
                dev_priv->de_irq_mask[pipe] = ~de_pipe_masked;
 

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 9f61d38..2dad655 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4029,9 +4029,9 @@ enum {
 /* Bspec claims those aren't shifted but stay at 0x64800 */
 #define EDP_PSR_IMR                            _MMIO(0x64834)
 #define EDP_PSR_IIR                            _MMIO(0x64838)
-#define   EDP_PSR_ERROR                                (1<<2)
-#define   EDP_PSR_POST_EXIT                    (1<<1)
-#define   EDP_PSR_PRE_ENTRY                    (1<<0)
+#define   EDP_PSR_ERROR(trans)                 (1 << (((trans) * 8 + 10) & 31))
+#define   EDP_PSR_POST_EXIT(trans)             (1 << (((trans) * 8 + 9) & 31))
+#define   EDP_PSR_PRE_ENTRY(trans)             (1 << (((trans) * 8 + 8) & 31))
 
 #define EDP_PSR_AUX_CTL                                _MMIO(dev_priv->psr_mmio_base + 0x10)
 #define   EDP_PSR_AUX_CTL_TIME_OUT_MASK                (3 << 26)
@@ -6969,6 +6969,7 @@ enum {
 #define GEN8_DE_MISC_IIR _MMIO(0x44468)
 #define GEN8_DE_MISC_IER _MMIO(0x4446c)
 #define  GEN8_DE_MISC_GSE              (1 << 27)
+#define  GEN8_DE_EDP_PSR               (1 << 19)
 
 #define GEN8_PCU_ISR _MMIO(0x444e0)
 #define GEN8_PCU_IMR _MMIO(0x444e4)

diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h
index 4e7418b..2ef3161 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@ -218,6 +218,10 @@ struct intel_link_m_n {
        for ((__p) = 0; (__p) < INTEL_INFO(__dev_priv)->num_pipes; (__p)++) \
                for_each_if((__mask) & BIT(__p))
 
+#define for_each_cpu_transcoder_masked(__dev_priv, __t, __mask) \
+       for ((__t) = 0; (__t) < I915_MAX_TRANSCODERS; (__t)++)  \
+               for_each_if ((__mask) & (1 << (__t)))
+
 #define for_each_universal_plane(__dev_priv, __pipe, __p)              \
        for ((__p) = 0;                                                 \
             (__p) < INTEL_INFO(__dev_priv)->num_sprites[(__pipe)] + 1; \