[Intel-gfx] [PATCH] drm/i915/icl: Fix initing the DSI DSC power refcount during HW readout

[Imre Deak]

On Thu, Jan 07, 2021 at 09:01:40AM +0200, Jani Nikula wrote:
> On Wed, 09 Dec 2020, Imre Deak <imre.deak at intel.com> wrote:
> > For an enabled DSC during HW readout the corresponding power reference
> > is taken along the CRTC power domain references in
> > get_crtc_power_domains(). Remove the incorrect get ref from the DSI
> > encoder hook.
> 
> Does this fix [1] which is v5.11-rc2 on TGL DSI?

Yes, looks like it:
<4> [199.269612] i915 0000:00:02.0: i915 raw-wakerefs=1 wakelocks=1 on cleanup
...
<7> [199.277233] i915 Wakeref x1 taken at:
    intel_display_power_get+0x1f/0x60 [i915]
    intel_modeset_setup_hw_state+0xbcf/0x19b0 [i915]

> Should we pick this up for fixes?

Yes.

Thanks,
Imre

> BR,
> Jani.
> 
> 
> [1] https://intel-gfx-ci.01.org/tree/drm-intel-fixes/CI_DIF_538/fi-tgl-dsi/igt@gem_exec_suspend@basic-s0.html
> 
> 
> 
> >
> > Cc: Vandita Kulkarni <vandita.kulkarni at intel.com>
> > Cc: Jani Nikula <jani.nikula at intel.com>
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/icl_dsi.c | 4 ----
> >  1 file changed, 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> > index a9439b415603..b3533a32f8ba 100644
> > --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> > @@ -1616,10 +1616,6 @@ static void gen11_dsi_get_power_domains(struct intel_encoder *encoder,
> >  
> >  	get_dsi_io_power_domains(i915,
> >  				 enc_to_intel_dsi(encoder));
> > -
> > -	if (crtc_state->dsc.compression_enable)
> > -		intel_display_power_get(i915,
> > -					intel_dsc_power_domain(crtc_state));
> >  }
> >  
> >  static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center