drm/i915/tgl: Handle AUX interrupts for TC ports

We're currently only processing AUX interrupts on the combo ports; make
sure we handle the TC ports as well.

v2: Drop stale comment

Fixes: f663769a5eef ("drm/i915/tgl: initialize TC and TBT ports")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191024173023.22113-1-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 0a3861c873ee037f37235f63898551277a5c8ff1..dae00f7dd7df83d6c387c576b2ff2c077fb2a02b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2161,10 +2161,16 @@ static u32 gen8_de_port_aux_mask(struct drm_i915_private *dev_priv)
        u32 mask;
 
        if (INTEL_GEN(dev_priv) >= 12)
-               /* TODO: Add AUX entries for USBC */
                return TGL_DE_PORT_AUX_DDIA |
                        TGL_DE_PORT_AUX_DDIB |
-                       TGL_DE_PORT_AUX_DDIC;
+                       TGL_DE_PORT_AUX_DDIC |
+                       TGL_DE_PORT_AUX_USBC1 |
+                       TGL_DE_PORT_AUX_USBC2 |
+                       TGL_DE_PORT_AUX_USBC3 |
+                       TGL_DE_PORT_AUX_USBC4 |
+                       TGL_DE_PORT_AUX_USBC5 |
+                       TGL_DE_PORT_AUX_USBC6;
+
 
        mask = GEN8_AUX_CHANNEL_A;
        if (INTEL_GEN(dev_priv) >= 9)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 60dfad33f9eeef3a32dee57b3910baa8bf20874a..fb33b164ce55797383da54bd576010c148d69a4a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7439,6 +7439,12 @@ enum {
 #define  GEN8_PORT_DP_A_HOTPLUG                (1 << 3)
 #define  BXT_DE_PORT_GMBUS             (1 << 1)
 #define  GEN8_AUX_CHANNEL_A            (1 << 0)
+#define  TGL_DE_PORT_AUX_USBC6         (1 << 13)
+#define  TGL_DE_PORT_AUX_USBC5         (1 << 12)
+#define  TGL_DE_PORT_AUX_USBC4         (1 << 11)
+#define  TGL_DE_PORT_AUX_USBC3         (1 << 10)
+#define  TGL_DE_PORT_AUX_USBC2         (1 << 9)
+#define  TGL_DE_PORT_AUX_USBC1         (1 << 8)
 #define  TGL_DE_PORT_AUX_DDIC          (1 << 2)
 #define  TGL_DE_PORT_AUX_DDIB          (1 << 1)
 #define  TGL_DE_PORT_AUX_DDIA          (1 << 0)