Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 232a6ee9 authored by Todd Previte's avatar Todd Previte Committed by Daniel Vetter
Browse files

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: default avatarTodd 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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 43181011

drivers/gpu/drm/i915/i915_reg.h

+7 −3
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/intel_dp.c

+28 −12
Original line number Diff line number Diff line
@@ -3009,19 +3009,35 @@ g4x_dp_detect(struct intel_dp *intel_dp) 
		return status;

	}



	if (IS_VALLEYVIEW(dev)) {

		switch (intel_dig_port->port) {

		case PORT_B:

		bit = PORTB_HOTPLUG_LIVE_STATUS;

			bit = PORTB_HOTPLUG_LIVE_STATUS_VLV;

			break;

		case PORT_C:

		bit = PORTC_HOTPLUG_LIVE_STATUS;

			bit = PORTC_HOTPLUG_LIVE_STATUS_VLV;

			break;

		case PORT_D:

		bit = PORTD_HOTPLUG_LIVE_STATUS;

			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)

		return connector_status_disconnected;