Skip to content

Commit 24a2817

Browse files
committed
drm/i915/ddi: s/crtc->config/old_crtc_state in haswell_crtc_disable()
crtc->config points to the old crtc state at the point display.crtc_disable() is called, so use the more descriptive pointer instead. v2: - Convert one remaining instance of the ptr in the function. (Ville) Cc: Vandita Kulkarni <[email protected]> Cc: Paulo Zanoni <[email protected]> Cc: Ville Syrjälä <[email protected]> Signed-off-by: Imre Deak <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 5422b37 commit 24a2817

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/i915/intel_display.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5814,7 +5814,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
58145814
struct drm_crtc *crtc = old_crtc_state->base.crtc;
58155815
struct drm_i915_private *dev_priv = to_i915(crtc->dev);
58165816
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;
58185818

58195819
intel_encoders_disable(crtc, old_crtc_state, old_state);
58205820

@@ -5825,8 +5825,8 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,
58255825
if (!transcoder_is_dsi(cpu_transcoder))
58265826
intel_disable_pipe(old_crtc_state);
58275827

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);
58305830

58315831
if (!transcoder_is_dsi(cpu_transcoder))
58325832
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,
58375837
ironlake_pfit_disable(intel_crtc, false);
58385838

58395839
if (!transcoder_is_dsi(cpu_transcoder))
5840-
intel_ddi_disable_pipe_clock(intel_crtc->config);
5840+
intel_ddi_disable_pipe_clock(old_crtc_state);
58415841

58425842
intel_encoders_post_disable(crtc, old_crtc_state, old_state);
58435843

0 commit comments

Comments
 (0)