From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Jani Nikula <jani.nikula@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [PATCH] drm/i915/bios: use a flag for vbt hdmi level shift presence Date: Tue, 5 Nov 2019 15:50:55 +0200 [thread overview] Message-ID: <20191105135055.GN1208@intel.com> (raw) In-Reply-To: <20191105133900.19590-1-jani.nikula@intel.com> On Tue, Nov 05, 2019 at 03:39:00PM +0200, Jani Nikula wrote: > The pre-initialized magic value is a bit silly, switch to a flag > instead. While at it, clean up the validity checks. No functional > changes apart from the added checks. > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 10 +--------- > drivers/gpu/drm/i915/display/intel_ddi.c | 19 +++++++++++-------- > drivers/gpu/drm/i915/i915_drv.h | 8 ++------ > 3 files changed, 14 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index a03f56b7b4ef..c19b234bebe6 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -1509,6 +1509,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, > port_name(port), > hdmi_level_shift); > info->hdmi_level_shift = hdmi_level_shift; > + info->hdmi_level_shift_set = true; > } > > if (bdb_version >= 204) { > @@ -1692,8 +1693,6 @@ parse_general_definitions(struct drm_i915_private *dev_priv, > static void > init_vbt_defaults(struct drm_i915_private *dev_priv) > { > - enum port port; > - > dev_priv->vbt.crt_ddc_pin = GMBUS_PIN_VGADDC; > > /* Default to having backlight */ > @@ -1721,13 +1720,6 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) > dev_priv->vbt.lvds_ssc_freq = intel_bios_ssc_frequency(dev_priv, > !HAS_PCH_SPLIT(dev_priv)); > DRM_DEBUG_KMS("Set default to SSC at %d kHz\n", dev_priv->vbt.lvds_ssc_freq); > - > - for_each_port(port) { > - struct ddi_vbt_port_info *info = > - &dev_priv->vbt.ddi_port_info[port]; > - > - info->hdmi_level_shift = HDMI_LEVEL_SHIFT_UNKNOWN; > - } > } > > /* Defaults to initialize only if there is no VBT. */ > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index c91521bcf06a..ec51f6971b16 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -888,11 +888,10 @@ icl_get_combo_buf_trans(struct drm_i915_private *dev_priv, int type, int rate, > > static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port) > { > + struct ddi_vbt_port_info *port_info = &dev_priv->vbt.ddi_port_info[port]; > int n_entries, level, default_entry; > enum phy phy = intel_port_to_phy(dev_priv, port); > > - level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift; > - > if (INTEL_GEN(dev_priv) >= 12) { > if (intel_phy_is_combo(dev_priv, phy)) > icl_get_combo_buf_trans(dev_priv, INTEL_OUTPUT_HDMI, > @@ -927,14 +926,18 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por > return 0; > } > > - /* Choose a good default if VBT is badly populated */ > - if (level == HDMI_LEVEL_SHIFT_UNKNOWN || level >= n_entries) > - level = default_entry; > - > if (WARN_ON_ONCE(n_entries == 0)) > return 0; > - if (WARN_ON_ONCE(level >= n_entries)) > - level = n_entries - 1; > + > + if (WARN_ON_ONCE(default_entry >= n_entries)) > + default_entry = n_entries - 1; > + > + if (port_info->hdmi_level_shift_set && > + !WARN_ON_ONCE(port_info->hdmi_level_shift >= n_entries)) { > + level = port_info->hdmi_level_shift; > + } else { > + level = default_entry; > + } I'd probably simplify that to something like: if (level_shift_set) level = level_shift; else level = default; if (WARN_ON_ONCE(level >= n_entries)) level = n_entries - 1; Either way: Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > return level; > } > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 7e0f67babe20..67bdfe6de3fa 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -627,13 +627,9 @@ struct ddi_vbt_port_info { > > int max_tmds_clock; > > - /* > - * This is an index in the HDMI/DVI DDI buffer translation table. > - * The special value HDMI_LEVEL_SHIFT_UNKNOWN means the VBT didn't > - * populate this field. > - */ > -#define HDMI_LEVEL_SHIFT_UNKNOWN 0xff > + /* This is an index in the HDMI/DVI DDI buffer translation table. */ > u8 hdmi_level_shift; > + u8 hdmi_level_shift_set:1; > > u8 supports_dvi:1; > u8 supports_hdmi:1; > -- > 2.20.1 -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Jani Nikula <jani.nikula@intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915/bios: use a flag for vbt hdmi level shift presence Date: Tue, 5 Nov 2019 15:50:55 +0200 [thread overview] Message-ID: <20191105135055.GN1208@intel.com> (raw) Message-ID: <20191105135055.17ApiY1VjGlk6u1wEiWpqgaqHz5vMomWkOzn1APJpcE@z> (raw) In-Reply-To: <20191105133900.19590-1-jani.nikula@intel.com> On Tue, Nov 05, 2019 at 03:39:00PM +0200, Jani Nikula wrote: > The pre-initialized magic value is a bit silly, switch to a flag > instead. While at it, clean up the validity checks. No functional > changes apart from the added checks. > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 10 +--------- > drivers/gpu/drm/i915/display/intel_ddi.c | 19 +++++++++++-------- > drivers/gpu/drm/i915/i915_drv.h | 8 ++------ > 3 files changed, 14 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index a03f56b7b4ef..c19b234bebe6 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -1509,6 +1509,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, > port_name(port), > hdmi_level_shift); > info->hdmi_level_shift = hdmi_level_shift; > + info->hdmi_level_shift_set = true; > } > > if (bdb_version >= 204) { > @@ -1692,8 +1693,6 @@ parse_general_definitions(struct drm_i915_private *dev_priv, > static void > init_vbt_defaults(struct drm_i915_private *dev_priv) > { > - enum port port; > - > dev_priv->vbt.crt_ddc_pin = GMBUS_PIN_VGADDC; > > /* Default to having backlight */ > @@ -1721,13 +1720,6 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) > dev_priv->vbt.lvds_ssc_freq = intel_bios_ssc_frequency(dev_priv, > !HAS_PCH_SPLIT(dev_priv)); > DRM_DEBUG_KMS("Set default to SSC at %d kHz\n", dev_priv->vbt.lvds_ssc_freq); > - > - for_each_port(port) { > - struct ddi_vbt_port_info *info = > - &dev_priv->vbt.ddi_port_info[port]; > - > - info->hdmi_level_shift = HDMI_LEVEL_SHIFT_UNKNOWN; > - } > } > > /* Defaults to initialize only if there is no VBT. */ > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index c91521bcf06a..ec51f6971b16 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -888,11 +888,10 @@ icl_get_combo_buf_trans(struct drm_i915_private *dev_priv, int type, int rate, > > static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port) > { > + struct ddi_vbt_port_info *port_info = &dev_priv->vbt.ddi_port_info[port]; > int n_entries, level, default_entry; > enum phy phy = intel_port_to_phy(dev_priv, port); > > - level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift; > - > if (INTEL_GEN(dev_priv) >= 12) { > if (intel_phy_is_combo(dev_priv, phy)) > icl_get_combo_buf_trans(dev_priv, INTEL_OUTPUT_HDMI, > @@ -927,14 +926,18 @@ static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port por > return 0; > } > > - /* Choose a good default if VBT is badly populated */ > - if (level == HDMI_LEVEL_SHIFT_UNKNOWN || level >= n_entries) > - level = default_entry; > - > if (WARN_ON_ONCE(n_entries == 0)) > return 0; > - if (WARN_ON_ONCE(level >= n_entries)) > - level = n_entries - 1; > + > + if (WARN_ON_ONCE(default_entry >= n_entries)) > + default_entry = n_entries - 1; > + > + if (port_info->hdmi_level_shift_set && > + !WARN_ON_ONCE(port_info->hdmi_level_shift >= n_entries)) { > + level = port_info->hdmi_level_shift; > + } else { > + level = default_entry; > + } I'd probably simplify that to something like: if (level_shift_set) level = level_shift; else level = default; if (WARN_ON_ONCE(level >= n_entries)) level = n_entries - 1; Either way: Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > return level; > } > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 7e0f67babe20..67bdfe6de3fa 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -627,13 +627,9 @@ struct ddi_vbt_port_info { > > int max_tmds_clock; > > - /* > - * This is an index in the HDMI/DVI DDI buffer translation table. > - * The special value HDMI_LEVEL_SHIFT_UNKNOWN means the VBT didn't > - * populate this field. > - */ > -#define HDMI_LEVEL_SHIFT_UNKNOWN 0xff > + /* This is an index in the HDMI/DVI DDI buffer translation table. */ > u8 hdmi_level_shift; > + u8 hdmi_level_shift_set:1; > > u8 supports_dvi:1; > u8 supports_hdmi:1; > -- > 2.20.1 -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-05 13:50 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-05 13:39 [PATCH] drm/i915/bios: use a flag for vbt hdmi level shift presence Jani Nikula 2019-11-05 13:39 ` [Intel-gfx] " Jani Nikula 2019-11-05 13:50 ` Ville Syrjälä [this message] 2019-11-05 13:50 ` Ville Syrjälä 2019-11-05 13:59 ` Jani Nikula 2019-11-05 13:59 ` [Intel-gfx] " Jani Nikula 2019-11-05 15:21 ` Ville Syrjälä 2019-11-05 15:21 ` [Intel-gfx] " Ville Syrjälä 2019-11-05 15:37 ` Ville Syrjälä 2019-11-05 15:37 ` [Intel-gfx] " Ville Syrjälä 2019-11-05 15:54 ` ✓ Fi.CI.BAT: success for " Patchwork 2019-11-05 15:54 ` [Intel-gfx] " Patchwork 2019-11-06 7:34 ` ✗ Fi.CI.IGT: failure " Patchwork 2019-11-06 7:34 ` [Intel-gfx] " Patchwork 2019-11-07 10:32 [PATCH] " Jani Nikula 2019-11-07 10:47 ` Ville Syrjälä
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191105135055.GN1208@intel.com \ --to=ville.syrjala@linux.intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.