Skip to content

Commit 1092892

Browse files
committed
drm/i915/ltphy: Hook up LT Phy Enable & Disable sequences
Hook up the LT Phy enable and disable sequences using encoder-> enable/disable_clock and reusing the TBT enable disable sequence from cx0 PHY since it remains the same. Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com> Link: https://patch.msgid.link/20251101032513.4171255-18-suraj.kandpal@intel.com
1 parent fa5fd59 commit 1092892

5 files changed

Lines changed: 37 additions & 4 deletions

File tree

drivers/gpu/drm/i915/display/intel_cx0_phy.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "intel_display_utils.h"
1919
#include "intel_dp.h"
2020
#include "intel_hdmi.h"
21+
#include "intel_lt_phy.h"
2122
#include "intel_panel.h"
2223
#include "intel_psr.h"
2324
#include "intel_snps_hdmi_pll.h"
@@ -3150,8 +3151,8 @@ static int intel_mtl_tbt_clock_select(struct intel_display *display,
31503151
}
31513152
}
31523153

3153-
static void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,
3154-
const struct intel_crtc_state *crtc_state)
3154+
void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,
3155+
const struct intel_crtc_state *crtc_state)
31553156
{
31563157
struct intel_display *display = to_intel_display(encoder);
31573158
enum phy phy = intel_encoder_to_phy(encoder);
@@ -3335,7 +3336,7 @@ static bool intel_cx0_pll_is_enabled(struct intel_encoder *encoder)
33353336
intel_cx0_get_pclk_pll_request(lane);
33363337
}
33373338

3338-
static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)
3339+
void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)
33393340
{
33403341
struct intel_display *display = to_intel_display(encoder);
33413342
enum phy phy = intel_encoder_to_phy(encoder);

drivers/gpu/drm/i915/display/intel_cx0_phy.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,8 @@ int intel_mtl_tbt_calc_port_clock(struct intel_encoder *encoder);
6363
void intel_cx0_pll_power_save_wa(struct intel_display *display);
6464
void intel_lnl_mac_transmit_lfps(struct intel_encoder *encoder,
6565
const struct intel_crtc_state *crtc_state);
66+
void intel_mtl_tbt_pll_enable(struct intel_encoder *encoder,
67+
const struct intel_crtc_state *crtc_state);
68+
void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder);
6669

6770
#endif /* __INTEL_CX0_PHY_H__ */

drivers/gpu/drm/i915/display/intel_ddi.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
#include "intel_hotplug.h"
7373
#include "intel_hti.h"
7474
#include "intel_lspcon.h"
75+
#include "intel_lt_phy.h"
7576
#include "intel_mg_phy_regs.h"
7677
#include "intel_modeset_lock.h"
7778
#include "intel_panel.h"
@@ -5231,7 +5232,11 @@ void intel_ddi_init(struct intel_display *display,
52315232
encoder->cloneable = 0;
52325233
encoder->pipe_mask = ~0;
52335234

5234-
if (DISPLAY_VER(display) >= 14) {
5235+
if (HAS_LT_PHY(display)) {
5236+
encoder->enable_clock = intel_xe3plpd_pll_enable;
5237+
encoder->disable_clock = intel_xe3plpd_pll_disable;
5238+
encoder->port_pll_type = intel_mtl_port_pll_type;
5239+
} else if (DISPLAY_VER(display) >= 14) {
52355240
encoder->enable_clock = intel_mtl_pll_enable;
52365241
encoder->disable_clock = intel_mtl_pll_disable;
52375242
encoder->port_pll_type = intel_mtl_port_pll_type;

drivers/gpu/drm/i915/display/intel_lt_phy.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,3 +1705,24 @@ void intel_lt_phy_pll_disable(struct intel_encoder *encoder)
17051705

17061706
intel_lt_phy_transaction_end(encoder, wakeref);
17071707
}
1708+
1709+
void intel_xe3plpd_pll_enable(struct intel_encoder *encoder,
1710+
const struct intel_crtc_state *crtc_state)
1711+
{
1712+
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
1713+
1714+
if (intel_tc_port_in_tbt_alt_mode(dig_port))
1715+
intel_mtl_tbt_pll_enable(encoder, crtc_state);
1716+
else
1717+
intel_lt_phy_pll_enable(encoder, crtc_state);
1718+
}
1719+
1720+
void intel_xe3plpd_pll_disable(struct intel_encoder *encoder)
1721+
{
1722+
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
1723+
1724+
if (intel_tc_port_in_tbt_alt_mode(dig_port))
1725+
intel_mtl_tbt_pll_disable(encoder);
1726+
else
1727+
intel_lt_phy_pll_disable(encoder);
1728+
}

drivers/gpu/drm/i915/display/intel_lt_phy.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ intel_lt_phy_pll_calc_state(struct intel_crtc_state *crtc_state,
2020
struct intel_encoder *encoder);
2121
int intel_lt_phy_calc_port_clock(struct intel_encoder *encoder,
2222
const struct intel_crtc_state *crtc_state);
23+
void intel_xe3plpd_pll_enable(struct intel_encoder *encoder,
24+
const struct intel_crtc_state *crtc_state);
25+
void intel_xe3plpd_pll_disable(struct intel_encoder *encoder);
2326

2427
#define HAS_LT_PHY(display) (DISPLAY_VER(display) >= 35)
2528

0 commit comments

Comments
 (0)