evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/dp: Make sink count DP 1.2 aware

Browse source 
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Adam Jackson 2012-09-20 16:42:45 -04:00 • committed by Daniel Vetter
parent 7883dc55e1
commit 232351777c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/i915/intel_dp.c
View file

@ -2101,12 +2101,11 @@ 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;
} }

3
include/drm/drm_dp_helper.h
View file

@ -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