Skip to content

Commit 48bb97c

Browse files
committed
Merge tag 'drm-intel-next-fixes-2025-08-05' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
drm/i915 fixes for v6.17-rc1: - Fixes around DP LFPS (Low-Frequency Periodic Signaling) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Jani Nikula <jani.nikula@intel.com> Link: https://lore.kernel.org/r/e1147bede8f219682419d198022cfe8d9d4edc28@intel.com
2 parents 6531a2c + 5a569ef commit 48bb97c

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3239,14 +3239,22 @@ void intel_lnl_mac_transmit_lfps(struct intel_encoder *encoder,
32393239
const struct intel_crtc_state *crtc_state)
32403240
{
32413241
struct intel_display *display = to_intel_display(encoder);
3242-
u8 owned_lane_mask = intel_cx0_get_owned_lane_mask(encoder);
3243-
bool enable = intel_alpm_is_alpm_aux_less(enc_to_intel_dp(encoder),
3244-
crtc_state);
3242+
intel_wakeref_t wakeref;
32453243
int i;
3244+
u8 owned_lane_mask;
32463245

3247-
if (DISPLAY_VER(display) < 20)
3246+
if (DISPLAY_VER(display) < 20 ||
3247+
!intel_alpm_is_alpm_aux_less(enc_to_intel_dp(encoder), crtc_state))
32483248
return;
32493249

3250+
owned_lane_mask = intel_cx0_get_owned_lane_mask(encoder);
3251+
3252+
wakeref = intel_cx0_phy_transaction_begin(encoder);
3253+
3254+
if (intel_encoder_is_c10phy(encoder))
3255+
intel_cx0_rmw(encoder, owned_lane_mask, PHY_C10_VDR_CONTROL(1), 0,
3256+
C10_VDR_CTRL_MSGBUS_ACCESS, MB_WRITE_COMMITTED);
3257+
32503258
for (i = 0; i < 4; i++) {
32513259
int tx = i % 2 + 1;
32523260
u8 lane_mask = i < 2 ? INTEL_CX0_LANE0 : INTEL_CX0_LANE1;
@@ -3256,9 +3264,10 @@ void intel_lnl_mac_transmit_lfps(struct intel_encoder *encoder,
32563264

32573265
intel_cx0_rmw(encoder, lane_mask, PHY_CMN1_CONTROL(tx, 0),
32583266
CONTROL0_MAC_TRANSMIT_LFPS,
3259-
enable ? CONTROL0_MAC_TRANSMIT_LFPS : 0,
3260-
MB_WRITE_COMMITTED);
3267+
CONTROL0_MAC_TRANSMIT_LFPS, MB_WRITE_COMMITTED);
32613268
}
3269+
3270+
intel_cx0_phy_transaction_end(encoder, wakeref);
32623271
}
32633272

32643273
static u8 cx0_power_control_disable_val(struct intel_encoder *encoder)

0 commit comments

Comments
 (0)