@@ -345,7 +345,6 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder,
345345 const struct intel_crtc_state * crtc_state )
346346{
347347 struct intel_display * display = to_intel_display (encoder );
348- struct drm_i915_private * dev_priv = to_i915 (encoder -> base .dev );
349348 struct intel_dsi * intel_dsi = enc_to_intel_dsi (encoder );
350349 enum port port ;
351350 int afe_clk_khz ;
@@ -354,7 +353,7 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder,
354353
355354 afe_clk_khz = afe_clk (encoder , crtc_state );
356355
357- if (IS_ALDERLAKE_S ( dev_priv ) || IS_ALDERLAKE_P ( dev_priv ) ) {
356+ if (display -> platform . alderlake_s || display -> platform . alderlake_p ) {
358357 theo_word_clk = DIV_ROUND_UP (afe_clk_khz , 8 * DSI_MAX_ESC_CLK );
359358 act_word_clk = max (3 , theo_word_clk + (theo_word_clk + 1 ) % 2 );
360359 esc_clk_div_m = act_word_clk * 8 ;
@@ -375,7 +374,7 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder,
375374 intel_de_posting_read (display , ICL_DPHY_ESC_CLK_DIV (port ));
376375 }
377376
378- if (IS_ALDERLAKE_S ( dev_priv ) || IS_ALDERLAKE_P ( dev_priv ) ) {
377+ if (display -> platform . alderlake_s || display -> platform . alderlake_p ) {
379378 for_each_dsi_port (port , intel_dsi -> ports ) {
380379 intel_de_write (display , ADL_MIPIO_DW (port , 8 ),
381380 esc_clk_div_m_phy & TX_ESC_CLK_DIV_PHY );
@@ -426,7 +425,6 @@ static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)
426425static void gen11_dsi_config_phy_lanes_sequence (struct intel_encoder * encoder )
427426{
428427 struct intel_display * display = to_intel_display (encoder );
429- struct drm_i915_private * dev_priv = to_i915 (encoder -> base .dev );
430428 struct intel_dsi * intel_dsi = enc_to_intel_dsi (encoder );
431429 enum phy phy ;
432430 u32 tmp ;
@@ -451,7 +449,7 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)
451449 intel_de_write (display , ICL_PORT_TX_DW2_GRP (phy ), tmp );
452450
453451 /* For EHL, TGL, set latency optimization for PCS_DW1 lanes */
454- if (IS_JASPERLAKE ( dev_priv ) || IS_ELKHARTLAKE ( dev_priv ) ||
452+ if (display -> platform . jasperlake || display -> platform . elkhartlake ||
455453 (DISPLAY_VER (display ) >= 12 )) {
456454 intel_de_rmw (display , ICL_PORT_PCS_DW1_AUX (phy ),
457455 LATENCY_OPTIM_MASK , LATENCY_OPTIM_VAL (0 ));
@@ -533,7 +531,6 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,
533531 const struct intel_crtc_state * crtc_state )
534532{
535533 struct intel_display * display = to_intel_display (encoder );
536- struct drm_i915_private * dev_priv = to_i915 (encoder -> base .dev );
537534 struct intel_dsi * intel_dsi = enc_to_intel_dsi (encoder );
538535 enum port port ;
539536 enum phy phy ;
@@ -563,7 +560,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,
563560 }
564561 }
565562
566- if (IS_JASPERLAKE ( dev_priv ) || IS_ELKHARTLAKE ( dev_priv ) ) {
563+ if (display -> platform . jasperlake || display -> platform . elkhartlake ) {
567564 for_each_dsi_phy (phy , intel_dsi -> phys )
568565 intel_de_rmw (display , ICL_DPHY_CHKN (phy ),
569566 0 , ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP );
0 commit comments