From: Animesh Manna <animesh.manna@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com, uma.shankar@intel.com,
dibin.moolakadan.subrahmanian@intel.com,
Animesh Manna <animesh.manna@intel.com>
Subject: [PATCH v3 02/12] drm/i915/cmtg: set CMTG clock select
Date: Fri, 13 Mar 2026 21:02:50 +0530 [thread overview]
Message-ID: <20260313153300.3530695-3-animesh.manna@intel.com> (raw)
In-Reply-To: <20260313153300.3530695-1-animesh.manna@intel.com>
Program the CMTG Clock Select register based on the transcoder used.
v2:
- Correct mask for PHY B. [Jani]
- Use REG_FIELD_PREP() for enable value. [Dibin]
- Extend cmtg clock select for xe3plpd. [Dibin]
v3:
- cmtg support removed for old platform.
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Dibin Moolakadan Subrahmanian <dibin.moolakadan.subrahmanian@intel.com>
---
drivers/gpu/drm/i915/display/intel_cmtg.c | 24 +++++++++++++++++++
drivers/gpu/drm/i915/display/intel_cmtg.h | 1 +
.../gpu/drm/i915/display/intel_cmtg_regs.h | 2 ++
drivers/gpu/drm/i915/display/intel_lt_phy.c | 7 ++++--
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cmtg.c b/drivers/gpu/drm/i915/display/intel_cmtg.c
index 024d753eca55..644522b96288 100644
--- a/drivers/gpu/drm/i915/display/intel_cmtg.c
+++ b/drivers/gpu/drm/i915/display/intel_cmtg.c
@@ -199,3 +199,27 @@ bool intel_cmtg_is_allowed(const struct intel_crtc_state *crtc_state)
return false;
}
+
+void intel_cmtg_set_clk_select(const struct intel_crtc_state *crtc_state)
+{
+ struct intel_display *display = to_intel_display(crtc_state);
+ enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
+ u32 clk_sel_clr = 0;
+ u32 clk_sel_set = 0;
+
+ if (!intel_cmtg_is_allowed(crtc_state))
+ return;
+
+ if (cpu_transcoder == TRANSCODER_A) {
+ clk_sel_clr = CMTG_CLK_SEL_A_MASK;
+ clk_sel_set = CMTG_CLK_SELECT_PHYA_ENABLE;
+ }
+
+ if (cpu_transcoder == TRANSCODER_B) {
+ clk_sel_clr = CMTG_CLK_SEL_B_MASK;
+ clk_sel_set = CMTG_CLK_SELECT_PHYB_ENABLE;
+ }
+
+ if (clk_sel_set)
+ intel_de_rmw(display, CMTG_CLK_SEL, clk_sel_clr, clk_sel_set);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_cmtg.h b/drivers/gpu/drm/i915/display/intel_cmtg.h
index 7692cc98cf87..660ec513626e 100644
--- a/drivers/gpu/drm/i915/display/intel_cmtg.h
+++ b/drivers/gpu/drm/i915/display/intel_cmtg.h
@@ -9,6 +9,7 @@
struct intel_display;
struct intel_crtc_state;
+void intel_cmtg_set_clk_select(const struct intel_crtc_state *crtc_state);
void intel_cmtg_sanitize(struct intel_display *display);
bool intel_cmtg_is_allowed(const struct intel_crtc_state *crtc_state);
diff --git a/drivers/gpu/drm/i915/display/intel_cmtg_regs.h b/drivers/gpu/drm/i915/display/intel_cmtg_regs.h
index 945a35578284..8a767b659a23 100644
--- a/drivers/gpu/drm/i915/display/intel_cmtg_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_cmtg_regs.h
@@ -10,8 +10,10 @@
#define CMTG_CLK_SEL _MMIO(0x46160)
#define CMTG_CLK_SEL_A_MASK REG_GENMASK(31, 29)
+#define CMTG_CLK_SELECT_PHYA_ENABLE REG_FIELD_PREP(CMTG_CLK_SEL_A_MASK, 0x4)
#define CMTG_CLK_SEL_A_DISABLED REG_FIELD_PREP(CMTG_CLK_SEL_A_MASK, 0)
#define CMTG_CLK_SEL_B_MASK REG_GENMASK(15, 13)
+#define CMTG_CLK_SELECT_PHYB_ENABLE REG_FIELD_PREP(CMTG_CLK_SEL_A_MASK, 0x6)
#define CMTG_CLK_SEL_B_DISABLED REG_FIELD_PREP(CMTG_CLK_SEL_B_MASK, 0)
#define TRANS_CMTG_CTL_A _MMIO(0x6fa88)
diff --git a/drivers/gpu/drm/i915/display/intel_lt_phy.c b/drivers/gpu/drm/i915/display/intel_lt_phy.c
index eced8493e566..e78f3a00ea80 100644
--- a/drivers/gpu/drm/i915/display/intel_lt_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_lt_phy.c
@@ -5,6 +5,7 @@
#include <drm/drm_print.h>
+#include "intel_cmtg.h"
#include "intel_cx0_phy.h"
#include "intel_cx0_phy_regs.h"
#include "intel_ddi.h"
@@ -2249,10 +2250,12 @@ void intel_xe3plpd_pll_enable(struct intel_encoder *encoder,
{
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
- if (intel_tc_port_in_tbt_alt_mode(dig_port))
+ if (intel_tc_port_in_tbt_alt_mode(dig_port)) {
intel_mtl_tbt_pll_enable_clock(encoder, crtc_state->port_clock);
- else
+ } else {
intel_lt_phy_pll_enable(encoder, crtc_state);
+ intel_cmtg_set_clk_select(crtc_state);
+ }
}
void intel_xe3plpd_pll_disable(struct intel_encoder *encoder)
--
2.29.0
next prev parent reply other threads:[~2026-03-13 16:03 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-13 15:32 [PATCH v3 00/12] CMTG enablement Animesh Manna
2026-03-13 15:32 ` [PATCH v3 01/12] drm/i915/cmtg: add is_enable_allowed() for cmtg Animesh Manna
2026-04-06 18:48 ` Shankar, Uma
2026-04-07 8:59 ` Dibin Moolakadan Subrahmanian
2026-04-07 10:03 ` Ville Syrjälä
2026-03-13 15:32 ` Animesh Manna [this message]
2026-04-06 19:02 ` [PATCH v3 02/12] drm/i915/cmtg: set CMTG clock select Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 03/12] drm/i915/cmtg: set timings for CMTG Animesh Manna
2026-04-06 19:24 ` Shankar, Uma
2026-04-07 8:03 ` Jani Nikula
2026-04-07 10:00 ` Ville Syrjälä
2026-04-07 11:03 ` Jani Nikula
2026-04-09 14:00 ` Manna, Animesh
2026-03-13 15:32 ` [PATCH v3 04/12] drm/i915/cmtg: program VRR registers of CMTG Animesh Manna
2026-04-06 19:35 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 05/12] drm/i915/cmtg: set transcoder mn for CMTG Animesh Manna
2026-04-06 19:43 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 06/12] drm/i915/cmtg: add hook to enable CMTG with sync to port Animesh Manna
2026-04-06 19:52 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 07/12] drm/i915/cmtg: add a hook to enable ddi for CMTG Animesh Manna
2026-04-06 20:07 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 08/12] drm/i915/cmtg: modify existing hook to disable CMTG Animesh Manna
2026-04-06 20:13 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 09/12] drm/i915/cmtg: Add trigger to enable/disable cmtg Animesh Manna
2026-04-06 20:50 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 10/12] drm/i915/cmtg: Add CMTG interrupt handling Animesh Manna
2026-04-06 21:37 ` Shankar, Uma
2026-03-13 15:32 ` [PATCH v3 11/12] drm/i915/cmtg: set dc3co_enable flag for lobf/psr2/pr-alpm Animesh Manna
2026-04-06 21:39 ` Shankar, Uma
2026-03-13 15:33 ` [PATCH v3 12/12] drm/i915/cmtg: disable CMTG if dc3co entry condition not met Animesh Manna
2026-04-06 21:42 ` Shankar, Uma
2026-03-13 17:53 ` ✓ i915.CI.BAT: success for CMTG enablement (rev3) Patchwork
2026-03-14 21:26 ` ✓ i915.CI.Full: " 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=20260313153300.3530695-3-animesh.manna@intel.com \
--to=animesh.manna@intel.com \
--cc=dibin.moolakadan.subrahmanian@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=uma.shankar@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