| Message ID | 20230616210028.1601533-1-radhakrishna.sripada@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/mtl: Skip using vbt hdmi_level_shifter selection on MTL | expand |
On Fri, 2023-06-16 at 14:00 -0700, Radhakrishna Sripada wrote: > The hdmi_level_shifter part of General Bytes definition in VBT, which was > used for choosing different levels on earlier platforms is now a hidden > optin and shows the default value of 0. The level shifter is now to be > deduced from hdmi_default_entry in intel_ddi_buf_trans for each phy. > > Skip providing the default hw provided value to force driver to choose hdmi > default entry. > > Bspec: 20124 > Cc: Khaled Almahallawy <khaled.almahallawy@intel.com> > Cc: Lee Shawn C <shawn.c.lee@intel.com> > Cc: Clint Taylor <Clinton.A.Taylor@intel.com> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c > b/drivers/gpu/drm/i915/display/intel_bios.c > index 34a397adbd6b..4b9bf76e137d 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -2615,7 +2615,8 @@ intel_bios_encoder_is_lspcon(const struct intel_bios_encoder_data > *devdata) > /* This is an index in the HDMI/DVI DDI buffer translation table, or -1 */ > int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *devdata) > { > - if (!devdata || devdata->i915->display.vbt.version < 158) > + if (!devdata || devdata->i915->display.vbt.version < 158 || > + DISPLAY_VER(devdata->i915) >= 14) > return -1; > Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> -Clint > return devdata->child.hdmi_level_shifter_value;
Merged. Thank you for the review. --Radhakrishna(RK) Sripada > -----Original Message----- > From: Taylor, Clinton A <clinton.a.taylor@intel.com> > Sent: Tuesday, June 20, 2023 2:10 PM > To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: Lee, Shawn C <shawn.c.lee@intel.com>; Almahallawy, Khaled > <khaled.almahallawy@intel.com> > Subject: Re: [PATCH] drm/i915/mtl: Skip using vbt hdmi_level_shifter selection > on MTL > > On Fri, 2023-06-16 at 14:00 -0700, Radhakrishna Sripada wrote: > > The hdmi_level_shifter part of General Bytes definition in VBT, which was > > used for choosing different levels on earlier platforms is now a hidden > > optin and shows the default value of 0. The level shifter is now to be > > deduced from hdmi_default_entry in intel_ddi_buf_trans for each phy. > > > > Skip providing the default hw provided value to force driver to choose hdmi > > default entry. > > > > Bspec: 20124 > > Cc: Khaled Almahallawy <khaled.almahallawy@intel.com> > > Cc: Lee Shawn C <shawn.c.lee@intel.com> > > Cc: Clint Taylor <Clinton.A.Taylor@intel.com> > > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c > > b/drivers/gpu/drm/i915/display/intel_bios.c > > index 34a397adbd6b..4b9bf76e137d 100644 > > --- a/drivers/gpu/drm/i915/display/intel_bios.c > > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > > @@ -2615,7 +2615,8 @@ intel_bios_encoder_is_lspcon(const struct > intel_bios_encoder_data > > *devdata) > > /* This is an index in the HDMI/DVI DDI buffer translation table, or -1 */ > > int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data > *devdata) > > { > > - if (!devdata || devdata->i915->display.vbt.version < 158) > > + if (!devdata || devdata->i915->display.vbt.version < 158 || > > + DISPLAY_VER(devdata->i915) >= 14) > > return -1; > > > Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> > > -Clint > > > return devdata->child.hdmi_level_shifter_value;
On Tue, 20 Jun 2023, "Sripada, Radhakrishna" <radhakrishna.sripada@intel.com> wrote: > Merged. Thank you for the review. Where are the CI results? Please never merge patches without CI results. BR, Jani. > > --Radhakrishna(RK) Sripada > >> -----Original Message----- >> From: Taylor, Clinton A <clinton.a.taylor@intel.com> >> Sent: Tuesday, June 20, 2023 2:10 PM >> To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; intel- >> gfx@lists.freedesktop.org >> Cc: Lee, Shawn C <shawn.c.lee@intel.com>; Almahallawy, Khaled >> <khaled.almahallawy@intel.com> >> Subject: Re: [PATCH] drm/i915/mtl: Skip using vbt hdmi_level_shifter selection >> on MTL >> >> On Fri, 2023-06-16 at 14:00 -0700, Radhakrishna Sripada wrote: >> > The hdmi_level_shifter part of General Bytes definition in VBT, which was >> > used for choosing different levels on earlier platforms is now a hidden >> > optin and shows the default value of 0. The level shifter is now to be >> > deduced from hdmi_default_entry in intel_ddi_buf_trans for each phy. >> > >> > Skip providing the default hw provided value to force driver to choose hdmi >> > default entry. >> > >> > Bspec: 20124 >> > Cc: Khaled Almahallawy <khaled.almahallawy@intel.com> >> > Cc: Lee Shawn C <shawn.c.lee@intel.com> >> > Cc: Clint Taylor <Clinton.A.Taylor@intel.com> >> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> >> > --- >> > drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- >> > 1 file changed, 2 insertions(+), 1 deletion(-) >> > >> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c >> > b/drivers/gpu/drm/i915/display/intel_bios.c >> > index 34a397adbd6b..4b9bf76e137d 100644 >> > --- a/drivers/gpu/drm/i915/display/intel_bios.c >> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c >> > @@ -2615,7 +2615,8 @@ intel_bios_encoder_is_lspcon(const struct >> intel_bios_encoder_data >> > *devdata) >> > /* This is an index in the HDMI/DVI DDI buffer translation table, or -1 */ >> > int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data >> *devdata) >> > { >> > - if (!devdata || devdata->i915->display.vbt.version < 158) >> > + if (!devdata || devdata->i915->display.vbt.version < 158 || >> > + DISPLAY_VER(devdata->i915) >= 14) >> > return -1; >> > >> Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> >> >> -Clint >> >> > return devdata->child.hdmi_level_shifter_value;
> -----Original Message----- > From: Jani Nikula <jani.nikula@linux.intel.com> > Sent: Wednesday, June 21, 2023 12:32 AM > To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; Taylor, Clinton A > <clinton.a.taylor@intel.com>; intel-gfx@lists.freedesktop.org > Subject: Re: [Intel-gfx] [PATCH] drm/i915/mtl: Skip using vbt hdmi_level_shifter > selection on MTL > > On Tue, 20 Jun 2023, "Sripada, Radhakrishna" > <radhakrishna.sripada@intel.com> wrote: > > Merged. Thank you for the review. > > Where are the CI results? > > Please never merge patches without CI results. Apologies Jani. Overlooked the green as CI results as the patch was sent 3 days ago. Let me trigger a fresh CI run. Will keep this in mind for future. --Radhakrishna(RK) Sripada > > BR, > Jani. > > > > > --Radhakrishna(RK) Sripada > > > >> -----Original Message----- > >> From: Taylor, Clinton A <clinton.a.taylor@intel.com> > >> Sent: Tuesday, June 20, 2023 2:10 PM > >> To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; intel- > >> gfx@lists.freedesktop.org > >> Cc: Lee, Shawn C <shawn.c.lee@intel.com>; Almahallawy, Khaled > >> <khaled.almahallawy@intel.com> > >> Subject: Re: [PATCH] drm/i915/mtl: Skip using vbt hdmi_level_shifter > selection > >> on MTL > >> > >> On Fri, 2023-06-16 at 14:00 -0700, Radhakrishna Sripada wrote: > >> > The hdmi_level_shifter part of General Bytes definition in VBT, which was > >> > used for choosing different levels on earlier platforms is now a hidden > >> > optin and shows the default value of 0. The level shifter is now to be > >> > deduced from hdmi_default_entry in intel_ddi_buf_trans for each phy. > >> > > >> > Skip providing the default hw provided value to force driver to choose hdmi > >> > default entry. > >> > > >> > Bspec: 20124 > >> > Cc: Khaled Almahallawy <khaled.almahallawy@intel.com> > >> > Cc: Lee Shawn C <shawn.c.lee@intel.com> > >> > Cc: Clint Taylor <Clinton.A.Taylor@intel.com> > >> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> > >> > --- > >> > drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- > >> > 1 file changed, 2 insertions(+), 1 deletion(-) > >> > > >> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c > >> > b/drivers/gpu/drm/i915/display/intel_bios.c > >> > index 34a397adbd6b..4b9bf76e137d 100644 > >> > --- a/drivers/gpu/drm/i915/display/intel_bios.c > >> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > >> > @@ -2615,7 +2615,8 @@ intel_bios_encoder_is_lspcon(const struct > >> intel_bios_encoder_data > >> > *devdata) > >> > /* This is an index in the HDMI/DVI DDI buffer translation table, or -1 */ > >> > int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data > >> *devdata) > >> > { > >> > - if (!devdata || devdata->i915->display.vbt.version < 158) > >> > + if (!devdata || devdata->i915->display.vbt.version < 158 || > >> > + DISPLAY_VER(devdata->i915) >= 14) > >> > return -1; > >> > > >> Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> > >> > >> -Clint > >> > >> > return devdata->child.hdmi_level_shifter_value; > > -- > Jani Nikula, Intel Open Source Graphics Center
On Wed, 21 Jun 2023, "Sripada, Radhakrishna" <radhakrishna.sripada@intel.com> wrote: >> -----Original Message----- >> From: Jani Nikula <jani.nikula@linux.intel.com> >> Sent: Wednesday, June 21, 2023 12:32 AM >> To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; Taylor, Clinton A >> <clinton.a.taylor@intel.com>; intel-gfx@lists.freedesktop.org >> Subject: Re: [Intel-gfx] [PATCH] drm/i915/mtl: Skip using vbt hdmi_level_shifter >> selection on MTL >> >> On Tue, 20 Jun 2023, "Sripada, Radhakrishna" >> <radhakrishna.sripada@intel.com> wrote: >> > Merged. Thank you for the review. >> >> Where are the CI results? >> >> Please never merge patches without CI results. > Apologies Jani. Overlooked the green as CI results as the patch was sent 3 days ago. Let me trigger a fresh CI run. The fresh run will fail because it can no longer apply the patch, as it's in the baseline already. > Will keep this in mind for future. Thanks, Jani. > > --Radhakrishna(RK) Sripada > >> >> BR, >> Jani. >> >> > >> > --Radhakrishna(RK) Sripada >> > >> >> -----Original Message----- >> >> From: Taylor, Clinton A <clinton.a.taylor@intel.com> >> >> Sent: Tuesday, June 20, 2023 2:10 PM >> >> To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com>; intel- >> >> gfx@lists.freedesktop.org >> >> Cc: Lee, Shawn C <shawn.c.lee@intel.com>; Almahallawy, Khaled >> >> <khaled.almahallawy@intel.com> >> >> Subject: Re: [PATCH] drm/i915/mtl: Skip using vbt hdmi_level_shifter >> selection >> >> on MTL >> >> >> >> On Fri, 2023-06-16 at 14:00 -0700, Radhakrishna Sripada wrote: >> >> > The hdmi_level_shifter part of General Bytes definition in VBT, which was >> >> > used for choosing different levels on earlier platforms is now a hidden >> >> > optin and shows the default value of 0. The level shifter is now to be >> >> > deduced from hdmi_default_entry in intel_ddi_buf_trans for each phy. >> >> > >> >> > Skip providing the default hw provided value to force driver to choose hdmi >> >> > default entry. >> >> > >> >> > Bspec: 20124 >> >> > Cc: Khaled Almahallawy <khaled.almahallawy@intel.com> >> >> > Cc: Lee Shawn C <shawn.c.lee@intel.com> >> >> > Cc: Clint Taylor <Clinton.A.Taylor@intel.com> >> >> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> >> >> > --- >> >> > drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- >> >> > 1 file changed, 2 insertions(+), 1 deletion(-) >> >> > >> >> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c >> >> > b/drivers/gpu/drm/i915/display/intel_bios.c >> >> > index 34a397adbd6b..4b9bf76e137d 100644 >> >> > --- a/drivers/gpu/drm/i915/display/intel_bios.c >> >> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c >> >> > @@ -2615,7 +2615,8 @@ intel_bios_encoder_is_lspcon(const struct >> >> intel_bios_encoder_data >> >> > *devdata) >> >> > /* This is an index in the HDMI/DVI DDI buffer translation table, or -1 */ >> >> > int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data >> >> *devdata) >> >> > { >> >> > - if (!devdata || devdata->i915->display.vbt.version < 158) >> >> > + if (!devdata || devdata->i915->display.vbt.version < 158 || >> >> > + DISPLAY_VER(devdata->i915) >= 14) >> >> > return -1; >> >> > >> >> Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> >> >> >> >> -Clint >> >> >> >> > return devdata->child.hdmi_level_shifter_value; >> >> -- >> Jani Nikula, Intel Open Source Graphics Center
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 34a397adbd6b..4b9bf76e137d 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2615,7 +2615,8 @@ intel_bios_encoder_is_lspcon(const struct intel_bios_encoder_data *devdata) /* This is an index in the HDMI/DVI DDI buffer translation table, or -1 */ int intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *devdata) { - if (!devdata || devdata->i915->display.vbt.version < 158) + if (!devdata || devdata->i915->display.vbt.version < 158 || + DISPLAY_VER(devdata->i915) >= 14) return -1; return devdata->child.hdmi_level_shifter_value;
The hdmi_level_shifter part of General Bytes definition in VBT, which was used for choosing different levels on earlier platforms is now a hidden optin and shows the default value of 0. The level shifter is now to be deduced from hdmi_default_entry in intel_ddi_buf_trans for each phy. Skip providing the default hw provided value to force driver to choose hdmi default entry. Bspec: 20124 Cc: Khaled Almahallawy <khaled.almahallawy@intel.com> Cc: Lee Shawn C <shawn.c.lee@intel.com> Cc: Clint Taylor <Clinton.A.Taylor@intel.com> Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com> --- drivers/gpu/drm/i915/display/intel_bios.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)