| Message ID | 20210901112815.16498-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dp: fix DG2 max source rate check | expand |
On Wed, Sep 01, 2021 at 02:28:15PM +0300, Jani Nikula wrote: > Accidentally dropped the else in a rebase fail, causing the DG2 max rate > to be overwritten later in the if ladder. > > Fixes: e752d1f9c14a ("drm/i915/dg2: add DG2 UHBR source rates") > Cc: Manasi Navare <manasi.d.navare@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 4f2fd33529ca..81b7097c6ff1 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -345,7 +345,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) > size = ARRAY_SIZE(icl_rates); > if (IS_DG2(dev_priv)) > max_rate = dg2_max_source_rate(intel_dp); > - if (IS_JSL_EHL(dev_priv)) > + else if (IS_JSL_EHL(dev_priv)) > max_rate = ehl_max_source_rate(intel_dp); > else > max_rate = icl_max_source_rate(intel_dp); > -- > 2.30.2 >
On Wed, Sep 01, 2021 at 02:28:15PM +0300, Jani Nikula wrote: > Accidentally dropped the else in a rebase fail, causing the DG2 max rate > to be overwritten later in the if ladder. > > Fixes: e752d1f9c14a ("drm/i915/dg2: add DG2 UHBR source rates") > Cc: Manasi Navare <manasi.d.navare@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Yes makes sense and fix looks good Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> Manasi > --- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 4f2fd33529ca..81b7097c6ff1 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -345,7 +345,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) > size = ARRAY_SIZE(icl_rates); > if (IS_DG2(dev_priv)) > max_rate = dg2_max_source_rate(intel_dp); > - if (IS_JSL_EHL(dev_priv)) > + else if (IS_JSL_EHL(dev_priv)) > max_rate = ehl_max_source_rate(intel_dp); > else > max_rate = icl_max_source_rate(intel_dp); > -- > 2.30.2 >
On Wed, 01 Sep 2021, Imre Deak <imre.deak@intel.com> wrote: > On Wed, Sep 01, 2021 at 02:28:15PM +0300, Jani Nikula wrote: >> Accidentally dropped the else in a rebase fail, causing the DG2 max rate >> to be overwritten later in the if ladder. >> >> Fixes: e752d1f9c14a ("drm/i915/dg2: add DG2 UHBR source rates") >> Cc: Manasi Navare <manasi.d.navare@intel.com> >> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Imre Deak <imre.deak@intel.com> Pushed, thanks for the reviews. BR, Jani. > >> --- >> drivers/gpu/drm/i915/display/intel_dp.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c >> index 4f2fd33529ca..81b7097c6ff1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp.c >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >> @@ -345,7 +345,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) >> size = ARRAY_SIZE(icl_rates); >> if (IS_DG2(dev_priv)) >> max_rate = dg2_max_source_rate(intel_dp); >> - if (IS_JSL_EHL(dev_priv)) >> + else if (IS_JSL_EHL(dev_priv)) >> max_rate = ehl_max_source_rate(intel_dp); >> else >> max_rate = icl_max_source_rate(intel_dp); >> -- >> 2.30.2 >>
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 4f2fd33529ca..81b7097c6ff1 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -345,7 +345,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) size = ARRAY_SIZE(icl_rates); if (IS_DG2(dev_priv)) max_rate = dg2_max_source_rate(intel_dp); - if (IS_JSL_EHL(dev_priv)) + else if (IS_JSL_EHL(dev_priv)) max_rate = ehl_max_source_rate(intel_dp); else max_rate = icl_max_source_rate(intel_dp);
Accidentally dropped the else in a rebase fail, causing the DG2 max rate to be overwritten later in the if ladder. Fixes: e752d1f9c14a ("drm/i915/dg2: add DG2 UHBR source rates") Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)