| Message ID | 20180613170710.15080-2-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 13, 2018 at 08:07:06PM +0300, Imre Deak wrote: > crtc->config points to the old crtc state at the point > display.crtc_disable() is called, so use the more descriptive pointer > instead. I see one more crtc->config in there. Either way Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Vandita Kulkarni <vandita.kulkarni@intel.com> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 0ddb9b5952a5..d9170e514825 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -5824,8 +5824,8 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, > if (!transcoder_is_dsi(cpu_transcoder)) > intel_disable_pipe(old_crtc_state); > > - if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST)) > - intel_ddi_set_vc_payload_alloc(intel_crtc->config, false); > + if (intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) > + intel_ddi_set_vc_payload_alloc(old_crtc_state, false); > > if (!transcoder_is_dsi(cpu_transcoder)) > intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder); > @@ -5836,7 +5836,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, > ironlake_pfit_disable(intel_crtc, false); > > if (!transcoder_is_dsi(cpu_transcoder)) > - intel_ddi_disable_pipe_clock(intel_crtc->config); > + intel_ddi_disable_pipe_clock(old_crtc_state); > > intel_encoders_post_disable(crtc, old_crtc_state, old_state); > > -- > 2.13.2
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0ddb9b5952a5..d9170e514825 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5824,8 +5824,8 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, if (!transcoder_is_dsi(cpu_transcoder)) intel_disable_pipe(old_crtc_state); - if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DP_MST)) - intel_ddi_set_vc_payload_alloc(intel_crtc->config, false); + if (intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) + intel_ddi_set_vc_payload_alloc(old_crtc_state, false); if (!transcoder_is_dsi(cpu_transcoder)) intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder); @@ -5836,7 +5836,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state, ironlake_pfit_disable(intel_crtc, false); if (!transcoder_is_dsi(cpu_transcoder)) - intel_ddi_disable_pipe_clock(intel_crtc->config); + intel_ddi_disable_pipe_clock(old_crtc_state); intel_encoders_post_disable(crtc, old_crtc_state, old_state);
crtc->config points to the old crtc state at the point display.crtc_disable() is called, so use the more descriptive pointer instead. Cc: Vandita Kulkarni <vandita.kulkarni@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)