All of lore.kernel.org
 help / color / mirror / Atom feed
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: add intel_bios_max_tmds_encoder()
Date: Fri, 17 Jan 2020 16:29:21 +0200	[thread overview]
Message-ID: <c52c39df43374b51f56439daf8047079afae7749.1579270868.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1579270868.git.jani.nikula@intel.com>

Don't access i915->vbt.ddi_port_info[] directly.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c | 7 +++++++
 drivers/gpu/drm/i915/display/intel_bios.h | 1 +
 drivers/gpu/drm/i915/display/intel_hdmi.c | 9 ++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 9a891ef72118..b231fafc03ca 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2562,3 +2562,10 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
 
 	return aux_ch;
 }
+
+int intel_bios_max_tmds_clock(struct intel_encoder *encoder)
+{
+	struct drm_i915_private *i915 = to_i915(encoder->base.dev);
+
+	return i915->vbt.ddi_port_info[encoder->port].max_tmds_clock;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index d6a0c29d37ac..519e983ee9e7 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -247,5 +247,6 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port
 bool intel_bios_get_dsc_params(struct intel_encoder *encoder,
 			       struct intel_crtc_state *crtc_state,
 			       int dsc_max_bpc);
+int intel_bios_max_tmds_clock(struct intel_encoder *encoder);
 
 #endif /* _INTEL_BIOS_H_ */
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 93ac0f296852..e8f8c87cd3e6 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2090,9 +2090,7 @@ static void pch_post_disable_hdmi(struct intel_encoder *encoder,
 static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-	const struct ddi_vbt_port_info *info =
-		&dev_priv->vbt.ddi_port_info[encoder->port];
-	int max_tmds_clock;
+	int max_tmds_clock, vbt_max_tmds_clock;
 
 	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
 		max_tmds_clock = 594000;
@@ -2103,8 +2101,9 @@ static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
 	else
 		max_tmds_clock = 165000;
 
-	if (info->max_tmds_clock)
-		max_tmds_clock = min(max_tmds_clock, info->max_tmds_clock);
+	vbt_max_tmds_clock = intel_bios_max_tmds_clock(encoder);
+	if (vbt_max_tmds_clock)
+		max_tmds_clock = min(max_tmds_clock, vbt_max_tmds_clock);
 
 	return max_tmds_clock;
 }
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2020-01-17 14:29 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-17 14:29 [Intel-gfx] [PATCH 0/9] drm/i915/bios: stop using vbt.ddi_port_info directly Jani Nikula
2020-01-17 14:29 ` Jani Nikula [this message]
2020-01-17 14:43   ` [Intel-gfx] [PATCH 1/9] drm/i915/bios: add intel_bios_max_tmds_encoder() Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 2/9] drm/i915/bios: add intel_bios_hdmi_level_shift() Jani Nikula
2020-01-17 14:45   ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 3/9] drm/i915/bios: intel_bios_dp_boost_level() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 4/9] drm/i915/bios: intel_bios_hdmi_boost_level() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 5/9] drm/i915/bios: add intel_bios_dp_max_link_rate() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 6/9] drm/i915/bios: add intel_bios_alternate_ddc_pin() Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 7/9] drm/i915/bios: add intel_bios_port_supports_*() Jani Nikula
2020-01-17 15:10   ` Ville Syrjälä
2020-01-17 14:29 ` [Intel-gfx] [PATCH 8/9] drm/i915/bios: check port presence based on child device Jani Nikula
2020-01-17 15:12   ` Ville Syrjälä
2020-01-17 15:13     ` Ville Syrjälä
2020-01-17 15:23       ` Ville Syrjälä
2020-01-17 15:28       ` Jani Nikula
2020-01-17 15:37         ` Ville Syrjälä
2020-01-21  9:44           ` Jani Nikula
2020-01-17 14:29 ` [Intel-gfx] [PATCH 9/9] drm/i915: use intel_bios_is_port_present() Jani Nikula
2020-01-17 15:14   ` Ville Syrjälä
2020-01-17 23:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/bios: stop using vbt.ddi_port_info directly Patchwork
2020-01-17 23:44 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork
2020-01-20 18:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork

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=c52c39df43374b51f56439daf8047079afae7749.1579270868.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: link
Be 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.