From: Ander Conselvan de Oliveira Date: Fri, 20 Mar 2015 14:18:10 +0000 (+0200) Subject: drm/i915: Don't depend on encoder->new_crtc in intel_dp_compute_config() X-Git-Tag: firefly_0821_release~176^2~1470^2~58^2~195 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=84556d58efead4cf4e53d807e5c846c7919be4c9;p=firefly-linux-kernel-4.4.55.git drm/i915: Don't depend on encoder->new_crtc in intel_dp_compute_config() Move towards atomic by using the legacy modeset's drm_atomic_state instead. Signed-off-by: Ander Conselvan de Oliveira Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 20088ec5561f..0286fc6fb89a 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1323,7 +1323,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); enum port port = dp_to_dig_port(intel_dp)->port; - struct intel_crtc *intel_crtc = encoder->new_crtc; + struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->base.crtc); struct intel_connector *intel_connector = intel_dp->attached_connector; int lane_count, clock; int min_lane_count = 1;