[PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Chaitanya Kumar Borah]

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 <rodrigo.vivi@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Nemesa Garg <nemesa.garg@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Fixes: 5ce9ac1531b8 ("drm/i915/mst: Call intel_pfit_compute_config() for sharpness filter")
Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
---
 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;
-- 
2.50.1

RE: [PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Garg, Nemesa]

> -----Original Message-----
> From: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>
> Sent: Thursday, August 6, 2026 1:18 PM
> To: intel-xe@lists.freedesktop.org; intel-gfx@lists.freedesktop.org
> Cc: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; Vivi,
> Rodrigo <rodrigo.vivi@intel.com>; Ville Syrjälä <ville.syrjala@linux.intel.com>;
> Garg, Nemesa <nemesa.garg@intel.com>; Jani Nikula
> <jani.nikula@linux.intel.com>
> Subject: [PATCH] drm/i915/dp_mst: Remove duplicate
> intel_pfit_compute_config() call
> 
> 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 <rodrigo.vivi@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Nemesa Garg <nemesa.garg@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Fixes: 5ce9ac1531b8 ("drm/i915/mst: Call intel_pfit_compute_config() for
> sharpness filter")
> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> ---
>  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;
> --
LGTM,
Reviewed-by: Nemesa Garg <nemesa.garg@intel.com>

> 2.50.1

Re: [PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Jani Nikula]

On Thu, 06 Aug 2026, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> 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 <rodrigo.vivi@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Nemesa Garg <nemesa.garg@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> 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!

BR,
Jani.


> Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> ---
>  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

Re: [PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Rodrigo Vivi]

On Thu, Aug 06, 2026 at 12:30:16PM +0300, Jani Nikula wrote:
> On Thu, 06 Aug 2026, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> 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 <rodrigo.vivi@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Nemesa Garg <nemesa.garg@intel.com>
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > 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 <chaitanya.kumar.borah@intel.com>
> > ---
> >  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

✓ i915.CI.BAT: success for drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

== Series Details ==

Series: drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call
URL   : https://patchwork.freedesktop.org/series/171712/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_18955 -> Patchwork_171712v1
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_171712v1/index.html

Participating hosts (39 -> 37)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_171712v1 that come from known issues:

### IGT changes ###

#### Possible fixes ####

  * igt@kms_hdmi_inject@inject-audio:
    - fi-tgl-1115g4:      [FAIL][1] ([i915#16664]) -> [PASS][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18955/fi-tgl-1115g4/igt@kms_hdmi_inject@inject-audio.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_171712v1/fi-tgl-1115g4/igt@kms_hdmi_inject@inject-audio.html

  
  [i915#16664]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/16664


Build changes
-------------

  * Linux: CI_DRM_18955 -> Patchwork_171712v1

  CI-20190529: 20190529
  CI_DRM_18955: 8d11ccdc98daac5e969243b42907fd060a650091 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_9041: 9041
  Patchwork_171712v1: 8d11ccdc98daac5e969243b42907fd060a650091 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_171712v1/index.html

[-- Attachment #2: Type: text/html, Size: 2146 bytes --]

Re: [PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Rodrigo Vivi]

On Thu, Aug 06, 2026 at 03:52:33PM -0400, Rodrigo Vivi wrote:
> On Thu, Aug 06, 2026 at 12:30:16PM +0300, Jani Nikula wrote:
> > On Thu, 06 Aug 2026, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> 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 <rodrigo.vivi@intel.com>
> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > Cc: Nemesa Garg <nemesa.garg@intel.com>
> > > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > > 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?

I'm sorry, I got confused by intel_dp.c vs intel_dp_mst.c.

The thing is that 

5ce9ac1531b8 ("drm/i915/mst: Call intel_pfit_compute_config() for sharpness filter")

should never had been cherry-picked because

ca97f5546f19 ("drm/i915/mst: Call intel_pfit_compute_config() for sharpness filter")

was already in the same tree.

git didn't notice it and move forward with the cherry-pick
dim couldn't have possibly noticed it and proceeded

I failed to review and notice the duplication. I'm sorry about that.

and the duplication then propagated to all the branches...

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

for this patch here....
I pushing it right away to drm-intel-next.

> 
> Ville, thoughts?
> 
> > 
> > BR,
> > Jani.
> > 
> > 
> > > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> > > ---
> > >  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

Re: [PATCH] drm/i915/dp_mst: Remove duplicate intel_pfit_compute_config() call

[Rodrigo Vivi]

On Fri, Aug 07, 2026 at 07:55:41AM -0400, Rodrigo Vivi wrote:
> On Thu, Aug 06, 2026 at 03:52:33PM -0400, Rodrigo Vivi wrote:
> > On Thu, Aug 06, 2026 at 12:30:16PM +0300, Jani Nikula wrote:
> > > On Thu, 06 Aug 2026, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> 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 <rodrigo.vivi@intel.com>
> > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > > Cc: Nemesa Garg <nemesa.garg@intel.com>
> > > > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > > > 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?
> 
> I'm sorry, I got confused by intel_dp.c vs intel_dp_mst.c.
> 
> The thing is that 
> 
> 5ce9ac1531b8 ("drm/i915/mst: Call intel_pfit_compute_config() for sharpness filter")
> 
> should never had been cherry-picked because
> 
> ca97f5546f19 ("drm/i915/mst: Call intel_pfit_compute_config() for sharpness filter")
> 
> was already in the same tree.
> 
> git didn't notice it and move forward with the cherry-pick
> dim couldn't have possibly noticed it and proceeded
> 
> I failed to review and notice the duplication. I'm sorry about that.
> 
> and the duplication then propagated to all the branches...
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> for this patch here....
> I pushing it right away to drm-intel-next.

fyi: I adjusted the commit message with the history before pushing it.

> 
> > 
> > Ville, thoughts?
> > 
> > > 
> > > BR,
> > > Jani.
> > > 
> > > 
> > > > Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> > > > ---
> > > >  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