@@ -2534,12 +2534,12 @@ mtl_ddi_enable_d2d(struct intel_encoder *encoder)
25342534static void mtl_port_buf_ctl_program (struct intel_encoder * encoder ,
25352535 const struct intel_crtc_state * crtc_state )
25362536{
2537- struct drm_i915_private * i915 = to_i915 (encoder -> base . dev );
2537+ struct intel_display * display = to_intel_display (encoder );
25382538 struct intel_digital_port * dig_port = enc_to_dig_port (encoder );
25392539 enum port port = encoder -> port ;
25402540 u32 val ;
25412541
2542- val = intel_de_read (i915 , XELPDP_PORT_BUF_CTL1 (i915 , port ));
2542+ val = intel_de_read (display , XELPDP_PORT_BUF_CTL1 (i915 , port ));
25432543 val &= ~XELPDP_PORT_WIDTH_MASK ;
25442544 val |= XELPDP_PORT_WIDTH (mtl_get_port_width (crtc_state -> lane_count ));
25452545
@@ -2552,7 +2552,7 @@ static void mtl_port_buf_ctl_program(struct intel_encoder *encoder,
25522552 if (dig_port -> lane_reversal )
25532553 val |= XELPDP_PORT_REVERSAL ;
25542554
2555- intel_de_write (i915 , XELPDP_PORT_BUF_CTL1 (i915 , port ), val );
2555+ intel_de_write (display , XELPDP_PORT_BUF_CTL1 (display , port ), val );
25562556}
25572557
25582558static void mtl_port_buf_ctl_io_selection (struct intel_encoder * encoder )
@@ -3639,17 +3639,17 @@ static void adlp_tbt_to_dp_alt_switch_wa(struct intel_encoder *encoder)
36393639static void mtl_ddi_prepare_link_retrain (struct intel_dp * intel_dp ,
36403640 const struct intel_crtc_state * crtc_state )
36413641{
3642+ struct intel_display * display = to_intel_display (crtc_state );
36423643 struct intel_digital_port * dig_port = dp_to_dig_port (intel_dp );
36433644 struct intel_encoder * encoder = & dig_port -> base ;
3644- struct drm_i915_private * dev_priv = to_i915 (encoder -> base .dev );
36453645 enum port port = encoder -> port ;
36463646 u32 dp_tp_ctl ;
36473647
36483648 /*
36493649 * TODO: To train with only a different voltage swing entry is not
36503650 * necessary disable and enable port
36513651 */
3652- dp_tp_ctl = intel_de_read (dev_priv , dp_tp_ctl_reg (encoder , crtc_state ));
3652+ dp_tp_ctl = intel_de_read (display , dp_tp_ctl_reg (encoder , crtc_state ));
36533653 if (dp_tp_ctl & DP_TP_CTL_ENABLE )
36543654 mtl_disable_ddi_buf (encoder , crtc_state );
36553655
@@ -3662,8 +3662,8 @@ static void mtl_ddi_prepare_link_retrain(struct intel_dp *intel_dp,
36623662 if (crtc_state -> enhanced_framing )
36633663 dp_tp_ctl |= DP_TP_CTL_ENHANCED_FRAME_ENABLE ;
36643664 }
3665- intel_de_write (dev_priv , dp_tp_ctl_reg (encoder , crtc_state ), dp_tp_ctl );
3666- intel_de_posting_read (dev_priv , dp_tp_ctl_reg (encoder , crtc_state ));
3665+ intel_de_write (display , dp_tp_ctl_reg (encoder , crtc_state ), dp_tp_ctl );
3666+ intel_de_posting_read (display , dp_tp_ctl_reg (encoder , crtc_state ));
36673667
36683668 /* 6.f Enable D2D Link */
36693669 mtl_ddi_enable_d2d (encoder );
@@ -3676,11 +3676,11 @@ static void mtl_ddi_prepare_link_retrain(struct intel_dp *intel_dp,
36763676
36773677 /* 6.i Configure and enable DDI_CTL_DE to start sending valid data to port slice */
36783678 intel_dp -> DP |= DDI_BUF_CTL_ENABLE ;
3679- if (DISPLAY_VER (dev_priv ) >= 20 )
3679+ if (DISPLAY_VER (display ) >= 20 )
36803680 intel_dp -> DP |= XE2LPD_DDI_BUF_D2D_LINK_ENABLE ;
36813681
3682- intel_de_write (dev_priv , DDI_BUF_CTL (port ), intel_dp -> DP );
3683- intel_de_posting_read (dev_priv , DDI_BUF_CTL (port ));
3682+ intel_de_write (display , DDI_BUF_CTL (port ), intel_dp -> DP );
3683+ intel_de_posting_read (display , DDI_BUF_CTL (port ));
36843684
36853685 /* 6.j Poll for PORT_BUF_CTL Idle Status == 0, timeout after 100 us */
36863686 intel_wait_ddi_buf_active (encoder );
0 commit comments