drm/i915: VLV2 - Fix hotplug detect bits

Add new definitions for hotplug live status bits for VLV2 since they're
in reverse order from the gen4x ones.

Changelog:
- Restored gen4 bit definitions
- Added new definitions for VLV2
- Added platform check for IS_VALLEYVIEW() in dp_detect to use the correct
  bit defintions
- Replaced a lost trailing brace for the added switch()

Signed-off-by: Todd Previte <tprevite@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73951
[danvet: Switch to _VLV postfix instead of prefix and regroupg
comments again so that the g4x warning is right next to those defines.
Also add a _G4X suffix for those special ones. Also cc stable.]
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2 files changed, 35 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 84365cd22092..ba0550222269 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2122,9 +2122,13 @@
  * Please check the detailed lore in the commit message for for experimental
  * evidence.
  */
-#define   PORTD_HOTPLUG_LIVE_STATUS               (1 << 29)
-#define   PORTC_HOTPLUG_LIVE_STATUS               (1 << 28)
-#define   PORTB_HOTPLUG_LIVE_STATUS               (1 << 27)
+#define   PORTD_HOTPLUG_LIVE_STATUS_G4X         (1 << 29)
+#define   PORTC_HOTPLUG_LIVE_STATUS_G4X         (1 << 28)
+#define   PORTB_HOTPLUG_LIVE_STATUS_G4X         (1 << 27)
+/* VLV DP/HDMI bits again match Bspec */
+#define   PORTD_HOTPLUG_LIVE_STATUS_VLV         (1 << 27)
+#define   PORTC_HOTPLUG_LIVE_STATUS_VLV         (1 << 28)
+#define   PORTB_HOTPLUG_LIVE_STATUS_VLV         (1 << 29)
 #define   PORTD_HOTPLUG_INT_STATUS              (3 << 21)
 #define   PORTC_HOTPLUG_INT_STATUS              (3 << 19)
 #define   PORTB_HOTPLUG_INT_STATUS              (3 << 17)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 689b832f7551..5ede4e8e290d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3009,18 +3009,34 @@ g4x_dp_detect(struct intel_dp *intel_dp)
                 return status;
         }
 
-        switch (intel_dig_port->port) {
-        case PORT_B:
-                bit = PORTB_HOTPLUG_LIVE_STATUS;
-                break;
-        case PORT_C:
-                bit = PORTC_HOTPLUG_LIVE_STATUS;
-                break;
-        case PORT_D:
-                bit = PORTD_HOTPLUG_LIVE_STATUS;
-                break;
-        default:
-                return connector_status_unknown;
+        if (IS_VALLEYVIEW(dev)) {
+                switch (intel_dig_port->port) {
+                case PORT_B:
+                        bit = PORTB_HOTPLUG_LIVE_STATUS_VLV;
+                        break;
+                case PORT_C:
+                        bit = PORTC_HOTPLUG_LIVE_STATUS_VLV;
+                        break;
+                case PORT_D:
+                        bit = PORTD_HOTPLUG_LIVE_STATUS_VLV;
+                        break;
+                default:
+                        return connector_status_unknown;
+                }
+        } else {
+                switch (intel_dig_port->port) {
+                case PORT_B:
+                        bit = PORTB_HOTPLUG_LIVE_STATUS_G4X;
+                        break;
+                case PORT_C:
+                        bit = PORTC_HOTPLUG_LIVE_STATUS_G4X;
+                        break;
+                case PORT_D:
+                        bit = PORTD_HOTPLUG_LIVE_STATUS_G4X;
+                        break;
+                default:
+                        return connector_status_unknown;
+                }
         }
 
         if ((I915_READ(PORT_HOTPLUG_STAT) & bit) == 0)