diff mbox series

[1/2] Revert "drm/i915/mst: Reject modes that require the bigjoiner"

Message ID 20240227181849.22614-2-vidya.srinivas@intel.com (mailing list archive)
State New, archived
Headers show
Series Enable MST bigjoiner | expand

Commit Message

Srinivas, Vidya Feb. 27, 2024, 6:18 p.m. UTC
This reverts commit 9c058492b16f90bb772cb0dad567e8acc68e155d.

Reverting for adding MST bigjoiner functionality.

Signed-off-by: Vidya Srinivas <vidya.srinivas@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Jani Nikula Feb. 28, 2024, 9:08 a.m. UTC | #1
On Tue, 27 Feb 2024, Vidya Srinivas <vidya.srinivas@intel.com> wrote:
> This reverts commit 9c058492b16f90bb772cb0dad567e8acc68e155d.
>
> Reverting for adding MST bigjoiner functionality.

Please squash this together with the fix. Someone might think a revert
is a fix that needs to be backported. Besides, for bisection this
creates a non-working commit.

BR,
Jani.


>
> Signed-off-by: Vidya Srinivas <vidya.srinivas@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 db1254b036f1..b062f4ee6c8b 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -1349,10 +1349,6 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
>  	if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) {
>  		bigjoiner = true;
>  		max_dotclk *= 2;
> -
> -		/* TODO: add support for bigjoiner */
> -		*status = MODE_CLOCK_HIGH;
> -		return 0;
>  	}
>  
>  	if (DISPLAY_VER(dev_priv) >= 10 &&
Srinivas, Vidya Feb. 28, 2024, 9:10 a.m. UTC | #2
> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Wednesday, February 28, 2024 2:39 PM
> To: Srinivas, Vidya <vidya.srinivas@intel.com>; intel-gfx@lists.freedesktop.org
> Cc: Almahallawy, Khaled <khaled.almahallawy@intel.com>; Srinivas, Vidya
> <vidya.srinivas@intel.com>
> Subject: Re: [PATCH 1/2] Revert "drm/i915/mst: Reject modes that require the
> bigjoiner"
> 
> On Tue, 27 Feb 2024, Vidya Srinivas <vidya.srinivas@intel.com> wrote:
> > This reverts commit 9c058492b16f90bb772cb0dad567e8acc68e155d.
> >
> > Reverting for adding MST bigjoiner functionality.
> 
> Please squash this together with the fix. Someone might think a revert is a fix
> that needs to be backported. Besides, for bisection this creates a non-working
> commit.

Hello Jani

Thank you very much. Sure, I will squash it together with the fix and submit.

Regards
Vidya

> 
> BR,
> Jani.
> 
> 
> >
> > Signed-off-by: Vidya Srinivas <vidya.srinivas@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 db1254b036f1..b062f4ee6c8b 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > @@ -1349,10 +1349,6 @@ intel_dp_mst_mode_valid_ctx(struct
> drm_connector *connector,
> >  	if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) {
> >  		bigjoiner = true;
> >  		max_dotclk *= 2;
> > -
> > -		/* TODO: add support for bigjoiner */
> > -		*status = MODE_CLOCK_HIGH;
> > -		return 0;
> >  	}
> >
> >  	if (DISPLAY_VER(dev_priv) >= 10 &&
> 
> --
> Jani Nikula, Intel
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index db1254b036f1..b062f4ee6c8b 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1349,10 +1349,6 @@  intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
 	if (intel_dp_need_bigjoiner(intel_dp, mode->hdisplay, target_clock)) {
 		bigjoiner = true;
 		max_dotclk *= 2;
-
-		/* TODO: add support for bigjoiner */
-		*status = MODE_CLOCK_HIGH;
-		return 0;
 	}
 
 	if (DISPLAY_VER(dev_priv) >= 10 &&