@@ -5814,7 +5814,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
5814
5814
struct drm_crtc * crtc = old_crtc_state -> base .crtc ;
5815
5815
struct drm_i915_private * dev_priv = to_i915 (crtc -> dev );
5816
5816
struct intel_crtc * intel_crtc = to_intel_crtc (crtc );
5817
- enum transcoder cpu_transcoder = intel_crtc -> config -> cpu_transcoder ;
5817
+ enum transcoder cpu_transcoder = old_crtc_state -> cpu_transcoder ;
5818
5818
5819
5819
intel_encoders_disable (crtc , old_crtc_state , old_state );
5820
5820
@@ -5825,8 +5825,8 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
5825
5825
if (!transcoder_is_dsi (cpu_transcoder ))
5826
5826
intel_disable_pipe (old_crtc_state );
5827
5827
5828
- if (intel_crtc_has_type (intel_crtc -> config , INTEL_OUTPUT_DP_MST ))
5829
- intel_ddi_set_vc_payload_alloc (intel_crtc -> config , false);
5828
+ if (intel_crtc_has_type (old_crtc_state , INTEL_OUTPUT_DP_MST ))
5829
+ intel_ddi_set_vc_payload_alloc (old_crtc_state , false);
5830
5830
5831
5831
if (!transcoder_is_dsi (cpu_transcoder ))
5832
5832
intel_ddi_disable_transcoder_func (dev_priv , cpu_transcoder );
@@ -5837,7 +5837,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
5837
5837
ironlake_pfit_disable (intel_crtc , false);
5838
5838
5839
5839
if (!transcoder_is_dsi (cpu_transcoder ))
5840
- intel_ddi_disable_pipe_clock (intel_crtc -> config );
5840
+ intel_ddi_disable_pipe_clock (old_crtc_state );
5841
5841
5842
5842
intel_encoders_post_disable (crtc , old_crtc_state , old_state );
5843
5843
0 commit comments