Commit 23235177 authored by Adam Jackson's avatar Adam Jackson Committed by Daniel Vetter

drm/dp: Make sink count DP 1.2 aware

Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7883dc55
...@@ -2101,13 +2101,12 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp) ...@@ -2101,13 +2101,12 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)
/* If we're HPD-aware, SINK_COUNT changes dynamically */ /* If we're HPD-aware, SINK_COUNT changes dynamically */
hpd = !!(intel_dp->downstream_ports[0] & DP_DS_PORT_HPD); hpd = !!(intel_dp->downstream_ports[0] & DP_DS_PORT_HPD);
if (hpd) { if (hpd) {
uint8_t sink_count; uint8_t reg;
if (!intel_dp_aux_native_read_retry(intel_dp, DP_SINK_COUNT, if (!intel_dp_aux_native_read_retry(intel_dp, DP_SINK_COUNT,
&sink_count, 1)) &reg, 1))
return connector_status_unknown; return connector_status_unknown;
sink_count &= DP_SINK_COUNT_MASK; return DP_GET_SINK_COUNT(reg) ? connector_status_connected
return sink_count ? connector_status_connected : connector_status_disconnected;
: connector_status_disconnected;
} }
/* If no HPD, poke DDC gently */ /* If no HPD, poke DDC gently */
......
...@@ -221,7 +221,8 @@ ...@@ -221,7 +221,8 @@
# define DP_PSR_FRAME_CAPTURE (1 << 3) # define DP_PSR_FRAME_CAPTURE (1 << 3)
#define DP_SINK_COUNT 0x200 #define DP_SINK_COUNT 0x200
# define DP_SINK_COUNT_MASK (31 << 0) /* prior to 1.2 bit 7 was reserved mbz */
# define DP_GET_SINK_COUNT(x) ((((x) & 0x80) >> 1) | ((x) & 0x3f))
# define DP_SINK_CP_READY (1 << 6) # define DP_SINK_CP_READY (1 << 6)
#define DP_DEVICE_SERVICE_IRQ_VECTOR 0x201 #define DP_DEVICE_SERVICE_IRQ_VECTOR 0x201
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment