aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp_mst.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2016-08-09 11:04:06 -0400
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2016-08-23 05:07:33 -0400
commit1189e4f4d8818b438d5cdbd7d45a2c0ed6170671 (patch)
tree3f1198f7a5f54979933080043bc102e478a2c6a9 /drivers/gpu/drm/i915/intel_dp_mst.c
parent0a478c27db43ad6a0e229ff1b922a16d2eae9701 (diff)
drm/i915: Remove unused loop from intel_dp_mst_compute_config
Now that conn_state is passed in as argument to compute_config, it's guaranteed that there is a connector for the argument. The code that looks for the connector is now dead, and completely unused. Delete it. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1470755054-32699-8-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp_mst.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 5b5878e3bf6e..482dd07f5182 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -38,12 +38,9 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
38 struct intel_digital_port *intel_dig_port = intel_mst->primary; 38 struct intel_digital_port *intel_dig_port = intel_mst->primary;
39 struct intel_dp *intel_dp = &intel_dig_port->dp; 39 struct intel_dp *intel_dp = &intel_dig_port->dp;
40 struct drm_atomic_state *state; 40 struct drm_atomic_state *state;
41 int bpp, i; 41 int bpp;
42 int lane_count, slots; 42 int lane_count, slots;
43 const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; 43 const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
44 struct drm_connector *drm_connector;
45 struct intel_connector *connector, *found = NULL;
46 struct drm_connector_state *connector_state;
47 int mst_pbn; 44 int mst_pbn;
48 45
49 pipe_config->dp_encoder_is_mst = true; 46 pipe_config->dp_encoder_is_mst = true;
@@ -62,20 +59,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,
62 59
63 state = pipe_config->base.state; 60 state = pipe_config->base.state;
64 61
65 for_each_connector_in_state(state, drm_connector, connector_state, i) {
66 connector = to_intel_connector(drm_connector);
67
68 if (connector_state->best_encoder == &encoder->base) {
69 found = connector;
70 break;
71 }
72 }
73
74 if (!found) {
75 DRM_ERROR("can't find connector\n");
76 return false;
77 }
78
79 mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp); 62 mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
80 63
81 pipe_config->pbn = mst_pbn; 64 pipe_config->pbn = mst_pbn;