On Thu, Aug 06, 2026 at 12:30:16PM +0300, Jani Nikula wrote:
> On Thu, 06 Aug 2026, Chaitanya Kumar Borah <[email protected]>
> wrote:
> > mst_stream_compute_config() called intel_pfit_compute_config() twice
> > in a row. Probably because of a bad merge. Drop the redundant duplicate
> > call.
> >
> > Cc: Rodrigo Vivi <[email protected]>
> > Cc: Ville Syrjälä <[email protected]>
> > Cc: Nemesa Garg <[email protected]>
> > Cc: Jani Nikula <[email protected]>
> > Fixes: 5ce9ac1531b8 ("drm/i915/mst: Call intel_pfit_compute_config() for
> > sharpness filter")
>
> Rodrigo, by the looks of it, this was an unnecessary cherry-pick for
> fixes. The context for 5ce9ac1531b8 shows the existing call, so I don't
> think this is a merge failure. But why it happened, no idea!
Indeed weird, I should had caught that on the fixes, I'm sorry.
but it is weird anyway, looking to
d4686f34bbeb ("drm/i915/pfit: Call intel_pfit_compute_config() unconditionally
on (e)DP/HDMI")
which is the mentioned fixed patch, it actually introduces this chunck.
Then the fix patch introduces this again.
So, it looks like this also occurred on the drm-intel-next first anyway?
Ville, thoughts?
>
> BR,
> Jani.
>
>
> > Signed-off-by: Chaitanya Kumar Borah <[email protected]>
> > ---
> > drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 ----
> > 1 file changed, 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > index 3be1643f8d03..57daed0b0b36 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > @@ -761,10 +761,6 @@ static int mst_stream_compute_config(struct
> > intel_atomic_state *state,
> > pipe_config->sink_format = INTEL_OUTPUT_FORMAT_RGB;
> > pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
> >
> > - ret = intel_pfit_compute_config(pipe_config, conn_state);
> > - if (ret)
> > - return ret;
> > -
> > ret = intel_pfit_compute_config(pipe_config, conn_state);
> > if (ret)
> > return ret;
>
> --
> Jani Nikula, Intel
