From: Arun R Murthy <arun.r.murthy@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@linux.intel.com>,
imre.deak@intel.com, Arun R Murthy <arun.r.murthy@intel.com>
Subject: [PATCH v4 2/2] drm/i915/display/dp: Remove the uhbr13.5 pll state values
Date: Wed, 02 Apr 2025 16:16:39 +0530 [thread overview]
Message-ID: <20250402-dprates-v4-2-752535b2068a@intel.com> (raw)
In-Reply-To: <20250402-dprates-v4-0-752535b2068a@intel.com>
uhbr13.5 is not supported on dg2/mtl. This patch removes the pll state
table for synps and c20 PHY.
Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com>
---
drivers/gpu/drm/i915/display/intel_cx0_phy.c | 26 --------------------
drivers/gpu/drm/i915/display/intel_snps_phy.c | 35 ---------------------------
2 files changed, 61 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
index 22595766eac5332e541f3441bed80a187dc80224..398e207159876a54472560087b5841ca372b4c01 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
@@ -902,31 +902,6 @@ static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = {
},
};
-static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = {
- .clock = 1350000, /* 13.5 Gbps */
- .tx = { 0xbea0, /* tx cfg0 */
- 0x4800, /* tx cfg1 */
- 0x0000, /* tx cfg2 */
- },
- .cmn = {0x0500, /* cmn cfg0*/
- 0x0005, /* cmn cfg1 */
- 0x0000, /* cmn cfg2 */
- 0x0000, /* cmn cfg3 */
- },
- .mpllb = { 0x015f, /* mpllb cfg0 */
- 0x2205, /* mpllb cfg1 */
- 0x1b17, /* mpllb cfg2 */
- 0xffc1, /* mpllb cfg3 */
- 0xe100, /* mpllb cfg4 */
- 0xbd00, /* mpllb cfg5 */
- 0x2000, /* mpllb cfg6 */
- 0x0001, /* mpllb cfg7 */
- 0x4800, /* mpllb cfg8 */
- 0x0000, /* mpllb cfg9 */
- 0x0000, /* mpllb cfg10 */
- },
-};
-
static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = {
.clock = 2000000, /* 20 Gbps */
.tx = { 0xbe20, /* tx cfg0 */
@@ -957,7 +932,6 @@ static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = {
&mtl_c20_dp_hbr2,
&mtl_c20_dp_hbr3,
&mtl_c20_dp_uhbr10,
- &mtl_c20_dp_uhbr13_5,
&mtl_c20_dp_uhbr20,
NULL,
};
diff --git a/drivers/gpu/drm/i915/display/intel_snps_phy.c b/drivers/gpu/drm/i915/display/intel_snps_phy.c
index b9acd9fe160cde7de682b48648eb183a0549b014..79a6d14d7592a35ba51c52f6fe26564f3e1c1340 100644
--- a/drivers/gpu/drm/i915/display/intel_snps_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c
@@ -215,47 +215,12 @@ static const struct intel_mpllb_state dg2_dp_uhbr10_100 = {
REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_STEPSIZE, 76101),
};
-static const struct intel_mpllb_state dg2_dp_uhbr13_100 = {
- .clock = 1350000,
- .ref_control =
- REG_FIELD_PREP(SNPS_PHY_REF_CONTROL_REF_RANGE, 3),
- .mpllb_cp =
- REG_FIELD_PREP(SNPS_PHY_MPLLB_CP_INT, 5) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_CP_PROP, 45) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_CP_INT_GS, 65) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_CP_PROP_GS, 127),
- .mpllb_div =
- REG_FIELD_PREP(SNPS_PHY_MPLLB_DIV5_CLK_EN, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_DIV_CLK_EN, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_DIV_MULTIPLIER, 8) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_PMIX_EN, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_WORD_DIV2_EN, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_DP2_MODE, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_V2I, 3),
- .mpllb_div2 =
- REG_FIELD_PREP(SNPS_PHY_MPLLB_REF_CLK_DIV, 2) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_MULTIPLIER, 508),
- .mpllb_fracn1 =
- REG_FIELD_PREP(SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_FRACN_DEN, 1),
-
- /*
- * SSC will be enabled, DP UHBR has a minimum SSC requirement.
- */
- .mpllb_sscen =
- REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_EN, 1) |
- REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_PEAK, 79626),
- .mpllb_sscstep =
- REG_FIELD_PREP(SNPS_PHY_MPLLB_SSC_STEPSIZE, 102737),
-};
-
static const struct intel_mpllb_state * const dg2_dp_100_tables[] = {
&dg2_dp_rbr_100,
&dg2_dp_hbr1_100,
&dg2_dp_hbr2_100,
&dg2_dp_hbr3_100,
&dg2_dp_uhbr10_100,
- &dg2_dp_uhbr13_100,
NULL,
};
--
2.25.1
next prev parent reply other threads:[~2025-04-02 11:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-02 10:46 [PATCH v4 0/2] Remove UHBR13.5 for ICL, DG2 Arun R Murthy
2025-04-02 10:46 ` [PATCH v4 1/2] drm/i915/display/dp: Remove support for UHBR13.5 on display14 Arun R Murthy
2025-04-03 11:51 ` Jani Nikula
2025-04-14 6:39 ` Kandpal, Suraj
2025-04-02 10:46 ` Arun R Murthy [this message]
2025-04-02 11:37 ` ✗ Fi.CI.SPARSE: warning for Remove UHBR13.5 for ICL, DG2 (rev2) Patchwork
2025-04-02 12:00 ` ✓ i915.CI.BAT: success " Patchwork
2025-04-02 13:26 ` ✗ i915.CI.Full: 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=20250402-dprates-v4-2-752535b2068a@intel.com \
--to=arun.r.murthy@intel.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@linux.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox