diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 0beca9197a1f..629337dbca3d 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
@@ -99,7 +99,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder) | |||
99 | struct intel_dp *intel_dp = &intel_dig_port->dp; | 99 | struct intel_dp *intel_dp = &intel_dig_port->dp; |
100 | int ret; | 100 | int ret; |
101 | 101 | ||
102 | DRM_DEBUG_KMS("%d\n", intel_dp->active_streams); | 102 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); |
103 | 103 | ||
104 | drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, intel_mst->connector->port); | 104 | drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, intel_mst->connector->port); |
105 | 105 | ||
@@ -115,7 +115,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder) | |||
115 | struct intel_digital_port *intel_dig_port = intel_mst->primary; | 115 | struct intel_digital_port *intel_dig_port = intel_mst->primary; |
116 | struct intel_dp *intel_dp = &intel_dig_port->dp; | 116 | struct intel_dp *intel_dp = &intel_dig_port->dp; |
117 | 117 | ||
118 | DRM_DEBUG_KMS("%d\n", intel_dp->active_streams); | 118 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); |
119 | 119 | ||
120 | /* this can fail */ | 120 | /* this can fail */ |
121 | drm_dp_check_act_status(&intel_dp->mst_mgr); | 121 | drm_dp_check_act_status(&intel_dp->mst_mgr); |
@@ -124,10 +124,10 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder) | |||
124 | 124 | ||
125 | drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, intel_mst->connector->port); | 125 | drm_dp_mst_deallocate_vcpi(&intel_dp->mst_mgr, intel_mst->connector->port); |
126 | 126 | ||
127 | intel_dp->active_streams--; | 127 | intel_dp->active_mst_links--; |
128 | 128 | ||
129 | intel_mst->connector = NULL; | 129 | intel_mst->connector = NULL; |
130 | if (intel_dp->active_streams == 0) { | 130 | if (intel_dp->active_mst_links == 0) { |
131 | intel_dig_port->base.post_disable(&intel_dig_port->base); | 131 | intel_dig_port->base.post_disable(&intel_dig_port->base); |
132 | intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); | 132 | intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); |
133 | } | 133 | } |
@@ -165,11 +165,11 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder) | |||
165 | */ | 165 | */ |
166 | found->encoder = encoder; | 166 | found->encoder = encoder; |
167 | 167 | ||
168 | DRM_DEBUG_KMS("%d\n", intel_dp->active_streams); | 168 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); |
169 | 169 | ||
170 | intel_mst->connector = found; | 170 | intel_mst->connector = found; |
171 | 171 | ||
172 | if (intel_dp->active_streams == 0) { | 172 | if (intel_dp->active_mst_links == 0) { |
173 | intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config); | 173 | intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config); |
174 | 174 | ||
175 | intel_prepare_dp_ddi_buffers(&intel_dig_port->base); | 175 | intel_prepare_dp_ddi_buffers(&intel_dig_port->base); |
@@ -193,7 +193,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder) | |||
193 | } | 193 | } |
194 | 194 | ||
195 | 195 | ||
196 | intel_dp->active_streams++; | 196 | intel_dp->active_mst_links++; |
197 | temp = I915_READ(DP_TP_STATUS(port)); | 197 | temp = I915_READ(DP_TP_STATUS(port)); |
198 | I915_WRITE(DP_TP_STATUS(port), temp); | 198 | I915_WRITE(DP_TP_STATUS(port), temp); |
199 | 199 | ||
@@ -210,7 +210,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder) | |||
210 | enum port port = intel_dig_port->port; | 210 | enum port port = intel_dig_port->port; |
211 | int ret; | 211 | int ret; |
212 | 212 | ||
213 | DRM_DEBUG_KMS("%d\n", intel_dp->active_streams); | 213 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); |
214 | 214 | ||
215 | if (intel_wait_for_register(dev_priv, | 215 | if (intel_wait_for_register(dev_priv, |
216 | DP_TP_STATUS(port), | 216 | DP_TP_STATUS(port), |