From: Jani Nikula <jani.nikula@intel.com> To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com Subject: [PATCH 1/9] drm/i915/bios: use a flag for vbt hdmi level shift presence Date: Fri, 8 Nov 2019 17:39:48 +0200 [thread overview] Message-ID: <74fe24ab6d5f0ea2ff2059cdf044d6d3006080fc.1573227240.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1573227240.git.jani.nikula@intel.com> The pre-initialized magic value is a bit silly, switch to a flag instead. v2: Reduce paranoia to a single sanity check (Ville) 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 | 13 +++++++------ drivers/gpu/drm/i915/i915_drv.h | 8 ++------ 3 files changed, 10 insertions(+), 21 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 092f0341d8d4..1441672c5611 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,12 +926,14 @@ 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 (port_info->hdmi_level_shift_set) + level = port_info->hdmi_level_shift; + else + level = default_entry; + if (WARN_ON_ONCE(level >= n_entries)) level = n_entries - 1; 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 _______________________________________________ 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: Jani Nikula <jani.nikula@intel.com> To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com Subject: [Intel-gfx] [PATCH 1/9] drm/i915/bios: use a flag for vbt hdmi level shift presence Date: Fri, 8 Nov 2019 17:39:48 +0200 [thread overview] Message-ID: <74fe24ab6d5f0ea2ff2059cdf044d6d3006080fc.1573227240.git.jani.nikula@intel.com> (raw) Message-ID: <20191108153948.0sdkKoDMpBW_gJhlMN3b93wEE2G7kGSVYyTfcXm9iE4@z> (raw) In-Reply-To: <cover.1573227240.git.jani.nikula@intel.com> The pre-initialized magic value is a bit silly, switch to a flag instead. v2: Reduce paranoia to a single sanity check (Ville) 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 | 13 +++++++------ drivers/gpu/drm/i915/i915_drv.h | 8 ++------ 3 files changed, 10 insertions(+), 21 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 092f0341d8d4..1441672c5611 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,12 +926,14 @@ 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 (port_info->hdmi_level_shift_set) + level = port_info->hdmi_level_shift; + else + level = default_entry; + if (WARN_ON_ONCE(level >= n_entries)) level = n_entries - 1; 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 _______________________________________________ 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-08 15:40 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-08 15:39 [PATCH 0/9] drm/i915/dsi: enable DSC Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` Jani Nikula [this message] 2019-11-08 15:39 ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: use a flag for vbt hdmi level shift presence Jani Nikula 2019-11-12 16:14 ` Jani Nikula 2019-11-12 16:14 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 2/9] drm/i915/bios: store child devices in a list Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-12 16:14 ` Jani Nikula 2019-11-12 16:14 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 3/9] drm/i915/bios: pass devdata to parse_ddi_port Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 4/9] drm/i915/bios: parse compression parameters block Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 5/9] drm/i915/bios: add support for querying DSC details for encoder Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 6/9] drm/i915/dsc: move DP specific compute params to intel_dp.c Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 7/9] drm/i915/dsc: move slice height calculation to encoder Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 8/9] drm/i915/dsc: add support for computing and writing PPS for DSI encoders Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-08 15:39 ` [PATCH 9/9] drm/i915/dsi: add support for DSC Jani Nikula 2019-11-08 15:39 ` [Intel-gfx] " Jani Nikula 2019-11-14 10:23 ` Kulkarni, Vandita 2019-11-14 10:23 ` [Intel-gfx] " Kulkarni, Vandita 2019-11-08 18:14 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/dsi: enable DSC Patchwork 2019-11-08 18:14 ` [Intel-gfx] " Patchwork 2019-11-08 18:34 ` ✓ Fi.CI.BAT: success " Patchwork 2019-11-08 18:34 ` [Intel-gfx] " Patchwork 2019-11-10 13:12 ` ✓ Fi.CI.IGT: " Patchwork 2019-11-10 13:12 ` [Intel-gfx] " Patchwork 2019-11-12 14:38 ` [PATCH] drm/i915/bios: change slice count check Jani Nikula 2019-11-12 14:38 ` [Intel-gfx] " Jani Nikula 2019-11-13 10:46 ` [PATCH] drm/i915/dsi: conn_state->max_requested_bpc is not a thing on DSI Jani Nikula 2019-11-13 10:46 ` [Intel-gfx] " Jani Nikula
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=74fe24ab6d5f0ea2ff2059cdf044d6d3006080fc.1573227240.git.jani.nikula@intel.com \ --to=jani.nikula@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ /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.