From patchwork Wed Apr 2 10:46:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun R Murthy X-Patchwork-Id: 14035796 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A615C3601A for ; Wed, 2 Apr 2025 11:01:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02A7B10E745; Wed, 2 Apr 2025 11:01:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MwhKwqYc"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0010F10E0F5; Wed, 2 Apr 2025 11:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743591677; x=1775127677; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=F5KOpFqSrAP8cPWxtEDeSutDrgdwaN80t1KnFoAtY+w=; b=MwhKwqYcTBSjCYgPB4wtCcUcd121v8UAgM/k0OfwJcuZA6gsrCqhjlS7 qN+3t93MCCX4Noaq+SIviAlp25yrzjHWFnTbjM3D5xZvNuA83PKV0GQyR XUiMU6gIGXjWgsYXOjxIAgR6/RlKwoU6+FVGC6uFpqkafBUk6nehSXO5J lV+FIx4XpYduG4JQdsOvhvI1IIgy/nFLRt/V8RnErsESVabh3dFQA++JK Ov0MuiqwGG3qG7JokmvCVhhqotmQnQlZdFOK4fu19htcxpXh0horZmY5s qoSyocLNHZWWhkWI7yFeSJx5Bp3hEiv70B90vppTNH1fGy1ULQHBEO+sf A==; X-CSE-ConnectionGUID: ha3BYo4NTGeBPPeVhAo1ww== X-CSE-MsgGUID: Saea4LQRRCeuCF7O/bl+2w== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="62349463" X-IronPort-AV: E=Sophos;i="6.14,182,1736841600"; d="scan'208";a="62349463" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 04:01:17 -0700 X-CSE-ConnectionGUID: /Rpt/Y2OTBqIZIICyn9M1g== X-CSE-MsgGUID: Ty/Pzb6WTsCytNoSzi7sUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,182,1736841600"; d="scan'208";a="127174394" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa007.jf.intel.com with ESMTP; 02 Apr 2025 04:01:16 -0700 From: Arun R Murthy Date: Wed, 02 Apr 2025 16:16:38 +0530 Subject: [PATCH v4 1/2] drm/i915/display/dp: Remove support for UHBR13.5 on display14 MIME-Version: 1.0 Message-Id: <20250402-dprates-v4-1-752535b2068a@intel.com> References: <20250402-dprates-v4-0-752535b2068a@intel.com> In-Reply-To: <20250402-dprates-v4-0-752535b2068a@intel.com> To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Jani Nikula , imre.deak@intel.com, Arun R Murthy X-Mailer: b4 0.15-dev X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Support for UHBR 13.5 has been removed for mtl by the commit caf3d748f646 ("drm/i915/dp: Remove support for UHBR13.5") Removing UHBR13.5 on all display14- platforms due to the same retimer constraint. v2: Reframed the commit msg (Jani) v4: Reframed the commit msg & update the max rate supported (Jani) Signed-off-by: Arun R Murthy --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index f21f9b441fc2a4e644c69410e6ec6b3d37907478..92bca701a989b03e2ad4b3d9e7d0a9ef12567e5a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -481,7 +481,7 @@ bool intel_dp_has_joiner(struct intel_dp *intel_dp) static int dg2_max_source_rate(struct intel_dp *intel_dp) { - return intel_dp_is_edp(intel_dp) ? 810000 : 1350000; + return intel_dp_is_edp(intel_dp) ? 810000 : 1000000; } static int icl_max_source_rate(struct intel_dp *intel_dp) @@ -550,7 +550,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) }; static const int icl_rates[] = { 162000, 216000, 270000, 324000, 432000, 540000, 648000, 810000, - 1000000, 1350000, + 1000000, }; static const int bxt_rates[] = { 162000, 216000, 243000, 270000, 324000, 432000, 540000 From patchwork Wed Apr 2 10:46:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun R Murthy X-Patchwork-Id: 14035798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6B56C3601E for ; Wed, 2 Apr 2025 11:01:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 50F3010E754; Wed, 2 Apr 2025 11:01:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HWPZySkf"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id D295A10E754; Wed, 2 Apr 2025 11:01:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743591679; x=1775127679; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=659qeEUMOkhFP3a1/A6FQOnjN29aQ3lg8dIrLDkA/gg=; b=HWPZySkf2ohGp0aVGsqV7rALBuP8lEf8YnMBZJMDBh2rDh9wBZvecDE5 MJ1ZlgFqJ1cd8KJ1s31rE6O2R54yRHroqc8tagx6sKSrG9A2n1BIZtw8a H2uEGE7AtWOtO+17YOSTvnvUVblFL76Sky6nTfP+DAXPNDDmdtQgq5PeA ZuEE35wrJmaGsCNxE9OnOnWWdDuYuRvxn+z2WGuIg3QaiOebTjVX3+6hZ otmiIXNpaPBHRD7lCel+6OHHrct07NHY1ZxQMuKcJ1cVYvUn69/8U16KN /3FgUIei3d1emRwCYg9FAMqXmT6WE05dMmUMGJ1S6H/CHav6gxmBQW56Y A==; X-CSE-ConnectionGUID: /nK+E7fGSCmfKgosnUUFwA== X-CSE-MsgGUID: bi+OSgKxQ0mwsFudhEpMnw== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="62349475" X-IronPort-AV: E=Sophos;i="6.14,182,1736841600"; d="scan'208";a="62349475" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 04:01:18 -0700 X-CSE-ConnectionGUID: afMrdN2qSUeD/kblMA3Hsw== X-CSE-MsgGUID: k5VUOIw5SAah+S6ZLjdUAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,182,1736841600"; d="scan'208";a="127174406" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa007.jf.intel.com with ESMTP; 02 Apr 2025 04:01:18 -0700 From: Arun R Murthy Date: Wed, 02 Apr 2025 16:16:39 +0530 Subject: [PATCH v4 2/2] drm/i915/display/dp: Remove the uhbr13.5 pll state values MIME-Version: 1.0 Message-Id: <20250402-dprates-v4-2-752535b2068a@intel.com> References: <20250402-dprates-v4-0-752535b2068a@intel.com> In-Reply-To: <20250402-dprates-v4-0-752535b2068a@intel.com> To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Jani Nikula , imre.deak@intel.com, Arun R Murthy X-Mailer: b4 0.15-dev X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 --- 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, };