diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-08-09 11:04:05 -0400 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2016-08-23 05:07:23 -0400 |
commit | 0a478c27db43ad6a0e229ff1b922a16d2eae9701 (patch) | |
tree | 5971648c7c7f1b91bb07981bf260d15812eca4fa /drivers/gpu/drm/i915/intel_dp_mst.c | |
parent | fd6bbda9c7a46bec6462878787335d2ac6294040 (diff) |
drm/i915: Make encoder->compute_config take the connector state
Some places iterate over connector_state to find the right
connector, pass it along as argument.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470755054-32699-7-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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 8f7594ef39a9..5b5878e3bf6e 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #include <drm/drm_edid.h> | 31 | #include <drm/drm_edid.h> |
32 | 32 | ||
33 | static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, | 33 | static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, |
34 | struct intel_crtc_state *pipe_config) | 34 | struct intel_crtc_state *pipe_config, |
35 | struct drm_connector_state *conn_state) | ||
35 | { | 36 | { |
36 | struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base); | 37 | struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base); |
37 | struct intel_digital_port *intel_dig_port = intel_mst->primary; | 38 | struct intel_digital_port *intel_dig_port = intel_mst->primary; |
@@ -54,7 +55,6 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, | |||
54 | */ | 55 | */ |
55 | lane_count = drm_dp_max_lane_count(intel_dp->dpcd); | 56 | lane_count = drm_dp_max_lane_count(intel_dp->dpcd); |
56 | 57 | ||
57 | |||
58 | pipe_config->lane_count = lane_count; | 58 | pipe_config->lane_count = lane_count; |
59 | 59 | ||
60 | pipe_config->pipe_bpp = 24; | 60 | pipe_config->pipe_bpp = 24; |