> -----Original Message----- > From: Navare, Manasi D <manasi.d.navare@xxxxxxxxx> > Sent: Tuesday, June 8, 2021 2:01 AM > To: Kulkarni, Vandita <vandita.kulkarni@xxxxxxxxx> > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx; Nikula, Jani <jani.nikula@xxxxxxxxx>; > Manna, Animesh <animesh.manna@xxxxxxxxx> > Subject: Re: [v2] drm/i915/dsc: Fix bigjoiner check in dsc_disable > > On Mon, Jun 07, 2021 at 04:23:42PM +0530, Vandita Kulkarni wrote: > > This change takes care of resetting the dss_ctl registers in case of > > dsc_disable, bigjoiner disable and also uncompressed joiner disable. > > > > v2: Fix formatting > > > > Suggested-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Fixes: d961eb20adb6 (drm/i915/bigjoiner: atomic commit changes for > > uncompressed joiner) > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3537 > > Signed-off-by: Vandita Kulkarni <vandita.kulkarni@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/display/intel_vdsc.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c > > b/drivers/gpu/drm/i915/display/intel_vdsc.c > > index 19cd9531c115..b9828852a68f 100644 > > --- a/drivers/gpu/drm/i915/display/intel_vdsc.c > > +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c > > @@ -1161,12 +1161,12 @@ void intel_dsc_disable(const struct > intel_crtc_state *old_crtc_state) > > struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc); > > struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > > > > - if (!(old_crtc_state->dsc.compression_enable && > > - old_crtc_state->bigjoiner)) > > - return; > > - > > - intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0); > > - intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0); > > + /* Disable only if either of them is enabled */ > > + if (old_crtc_state->dsc.compression_enable || > > + old_crtc_state->dsc.compression_enable) { > > Vandita I think you have a copy paste error the second condition should be > old_crtc_state->bigjoiner ? Sorry. Will fix it. Thanks, Vandita > > Manasi > > > + intel_de_write(dev_priv, dss_ctl1_reg(old_crtc_state), 0); > > + intel_de_write(dev_priv, dss_ctl2_reg(old_crtc_state), 0); > > + } > > } > > > > void intel_uncompressed_joiner_get_config(struct intel_crtc_state > > *crtc_state) > > -- > > 2.21.0.5.gaeb582a > > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
