diff mbox

[28/42] drm/i915: Remove use of crtc->config from intel_dp_mst.c

Message ID 1431354318-11995-29-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst May 11, 2015, 2:25 p.m. UTC 
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_dp_mst.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 4992c8025520..4ecbc58c4e04 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -157,7 +157,8 @@  static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
 	struct intel_connector *found = NULL, *connector;
 	int slots;
 	struct drm_crtc *crtc = encoder->base.crtc;
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
 
 	for_each_intel_connector(dev, connector) {
 		if (connector->base.state->best_encoder == &encoder->base) {
@@ -180,7 +181,7 @@  static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
 		/* FIXME: add support for SKL */
 		if (INTEL_INFO(dev)->gen < 9)
 			I915_WRITE(PORT_CLK_SEL(port),
-				   intel_crtc->config->ddi_pll_sel);
+				   pipe_config->ddi_pll_sel);
 
 		intel_ddi_init_dp_buf_reg(&intel_dig_port->base);
 
@@ -194,7 +195,7 @@  static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
 
 	ret = drm_dp_mst_allocate_vcpi(&intel_dp->mst_mgr,
 				       intel_mst->port,
-				       intel_crtc->config->pbn, &slots);
+				       pipe_config->pbn, &slots);
 	if (ret == false) {
 		DRM_ERROR("failed to allocate vcpi\n");
 		return;