All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Shawn C <shawn.c.lee@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Cooper Chiou <cooper.chiou@intel.com>,
	William Tseng <william.tseng@intel.com>
Subject: [Intel-gfx] [PATCH] drm/i915/vbt: update DP max link rate table
Date: Mon,  1 Feb 2021 23:02:28 +0800	[thread overview]
Message-ID: <20210201150228.10001-1-shawn.c.lee@intel.com> (raw)

According to Bspec #20124, max link rate table for DP was updated
at BDB version 230. Max link rate can support upto UHBR.

After migrate to BDB v230, the definition for LBR, HBR2 and HBR3
were changed. For backward compatibility. If BDB version was
from 216 to 229. Driver have to follow original rule to configure
DP max link rate value from VBT.

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Cooper Chiou <cooper.chiou@intel.com>
Cc: William Tseng <william.tseng@intel.com>
Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c     | 24 ++++++++++++++++++-
 drivers/gpu/drm/i915/display/intel_vbt_defs.h | 14 +++++++----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 04337ac6f8c4..be1f732e6550 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1876,7 +1876,15 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
 	/* DP max link rate for CNL+ */
 	if (bdb_version >= 216) {
 		switch (child->dp_max_link_rate) {
-		default:
+		case VBT_DP_MAX_LINK_RATE_UHBR20:
+			info->dp_max_link_rate = 2000000;
+			break;
+		case VBT_DP_MAX_LINK_RATE_UHBR13P5:
+			info->dp_max_link_rate = 1350000;
+			break;
+		case VBT_DP_MAX_LINK_RATE_UHBR10:
+			info->dp_max_link_rate = 1000000;
+			break;
 		case VBT_DP_MAX_LINK_RATE_HBR3:
 			info->dp_max_link_rate = 810000;
 			break;
@@ -1889,7 +1897,21 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
 		case VBT_DP_MAX_LINK_RATE_LBR:
 			info->dp_max_link_rate = 162000;
 			break;
+		case VBT_DP_MAX_LINK_RATE_DEFAULT:
+		default:
+			info->dp_max_link_rate = 0;
+			break;
+		}
+
+		if (bdb_version < 230) {
+			if (child->dp_max_link_rate == VBT_DP_MAX_LINK_RATE_DEFAULT)
+				info->dp_max_link_rate = 810000;
+			else if (child->dp_max_link_rate == VBT_DP_MAX_LINK_RATE_LBR)
+				info->dp_max_link_rate = 540000;
+			else if (child->dp_max_link_rate == VBT_DP_MAX_LINK_RATE_HBR2)
+				info->dp_max_link_rate = 162000;
 		}
+
 		drm_dbg_kms(&dev_priv->drm,
 			    "VBT DP max link rate for port %c: %d\n",
 			    port_name(port), info->dp_max_link_rate);
diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
index 6d10fa037751..578a54b33f32 100644
--- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
@@ -343,10 +343,14 @@ enum vbt_gmbus_ddi {
 #define DP_AUX_H 0x80
 #define DP_AUX_I 0x90
 
-#define VBT_DP_MAX_LINK_RATE_HBR3	0
-#define VBT_DP_MAX_LINK_RATE_HBR2	1
+#define VBT_DP_MAX_LINK_RATE_DEFAULT	0
+#define VBT_DP_MAX_LINK_RATE_LBR	1
 #define VBT_DP_MAX_LINK_RATE_HBR	2
-#define VBT_DP_MAX_LINK_RATE_LBR	3
+#define VBT_DP_MAX_LINK_RATE_HBR2	3
+#define VBT_DP_MAX_LINK_RATE_HBR3	4
+#define VBT_DP_MAX_LINK_RATE_UHBR10	5
+#define VBT_DP_MAX_LINK_RATE_UHBR13P5	6
+#define VBT_DP_MAX_LINK_RATE_UHBR20	7
 
 /*
  * The child device config, aka the display device data structure, provides a
@@ -445,8 +449,8 @@ struct child_device_config {
 	u16 dp_gpio_pin_num;					/* 195 */
 	u8 dp_iboost_level:4;					/* 196 */
 	u8 hdmi_iboost_level:4;					/* 196 */
-	u8 dp_max_link_rate:2;					/* 216 CNL+ */
-	u8 dp_max_link_rate_reserved:6;				/* 216 */
+	u8 dp_max_link_rate:3;					/* 230 */
+	u8 dp_max_link_rate_reserved:5;				/* 230 */
 } __packed;
 
 struct bdb_general_definitions {
-- 
2.17.1

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

             reply	other threads:[~2021-02-01 14:56 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-01 15:02 Lee Shawn C [this message]
2021-02-01 18:31 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2021-02-01 23:51 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-02-05 20:26 ` [Intel-gfx] [PATCH] " Ville Syrjälä
2021-02-08 13:31   ` Lee, Shawn C
2021-02-10 16:51     ` Ville Syrjälä
2021-02-11  5:22       ` Lee, Shawn C
2021-02-12 16:31         ` Ville Syrjälä
2021-02-17  6:55 ` [Intel-gfx] [PATCH v2] " Lee Shawn C
2021-02-17 13:22   ` Ville Syrjälä
2021-02-17 15:38     ` Lee, Shawn C
2021-02-17  8:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/vbt: update DP max link rate table (rev2) Patchwork
2021-02-17  9:33 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-02-17 15:39 ` [Intel-gfx] [PATCH v3] drm/i915/vbt: update DP max link rate table Lee Shawn C
2021-02-17 15:45   ` Ville Syrjälä
2021-02-18 12:01     ` Lee, Shawn C
2021-02-17 15:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/vbt: update DP max link rate table (rev3) Patchwork
2021-02-17 16:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-02-17 18:46 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-02-18  5:23 ` [Intel-gfx] [PATCH v4] drm/i915/vbt: update DP max link rate table Lee Shawn C
2021-02-20 10:23   ` Ville Syrjälä
2021-02-18  6:40 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/vbt: update DP max link rate table (rev4) Patchwork
2021-02-18  7:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-02-18  9:21 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-02-18 11:29 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/vbt: update DP max link rate table (rev6) Patchwork
2021-02-18 11:59 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-02-18 13:44 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=20210201150228.10001-1-shawn.c.lee@intel.com \
    --to=shawn.c.lee@intel.com \
    --cc=cooper.chiou@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=william.tseng@intel.com \
    --subject='Re: [Intel-gfx] [PATCH] drm/i915/vbt: update DP max link rate table' \
    /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

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.