@@ -1400,15 +1400,15 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder,
1400
1400
static int translate_signal_level (struct intel_dp * intel_dp ,
1401
1401
u8 signal_levels )
1402
1402
{
1403
- struct drm_i915_private * i915 = dp_to_i915 (intel_dp );
1403
+ struct intel_display * display = to_intel_display (intel_dp );
1404
1404
int i ;
1405
1405
1406
1406
for (i = 0 ; i < ARRAY_SIZE (index_to_dp_signal_levels ); i ++ ) {
1407
1407
if (index_to_dp_signal_levels [i ] == signal_levels )
1408
1408
return i ;
1409
1409
}
1410
1410
1411
- drm_WARN (& i915 -> drm , 1 ,
1411
+ drm_WARN (display -> drm , 1 ,
1412
1412
"Unsupported voltage swing/pre-emphasis level: 0x%x\n" ,
1413
1413
signal_levels );
1414
1414
@@ -2211,14 +2211,14 @@ static void intel_dp_sink_set_msa_timing_par_ignore_state(struct intel_dp *intel
2211
2211
const struct intel_crtc_state * crtc_state ,
2212
2212
bool enable )
2213
2213
{
2214
- struct drm_i915_private * i915 = dp_to_i915 (intel_dp );
2214
+ struct intel_display * display = to_intel_display (intel_dp );
2215
2215
2216
2216
if (!crtc_state -> vrr .enable )
2217
2217
return ;
2218
2218
2219
2219
if (drm_dp_dpcd_writeb (& intel_dp -> aux , DP_DOWNSPREAD_CTRL ,
2220
2220
enable ? DP_MSA_TIMING_PAR_IGNORE_EN : 0 ) <= 0 )
2221
- drm_dbg_kms (& i915 -> drm ,
2221
+ drm_dbg_kms (display -> drm ,
2222
2222
"Failed to %s MSA_TIMING_PAR_IGNORE in the sink\n" ,
2223
2223
str_enable_disable (enable ));
2224
2224
}
@@ -2227,20 +2227,20 @@ static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,
2227
2227
const struct intel_crtc_state * crtc_state ,
2228
2228
bool enable )
2229
2229
{
2230
- struct drm_i915_private * i915 = dp_to_i915 (intel_dp );
2230
+ struct intel_display * display = to_intel_display (intel_dp );
2231
2231
2232
2232
if (!crtc_state -> fec_enable )
2233
2233
return ;
2234
2234
2235
2235
if (drm_dp_dpcd_writeb (& intel_dp -> aux , DP_FEC_CONFIGURATION ,
2236
2236
enable ? DP_FEC_READY : 0 ) <= 0 )
2237
- drm_dbg_kms (& i915 -> drm , "Failed to set FEC_READY to %s in the sink\n" ,
2237
+ drm_dbg_kms (display -> drm , "Failed to set FEC_READY to %s in the sink\n" ,
2238
2238
enable ? "enabled" : "disabled" );
2239
2239
2240
2240
if (enable &&
2241
2241
drm_dp_dpcd_writeb (& intel_dp -> aux , DP_FEC_STATUS ,
2242
2242
DP_FEC_DECODE_EN_DETECTED | DP_FEC_DECODE_DIS_DETECTED ) <= 0 )
2243
- drm_dbg_kms (& i915 -> drm , "Failed to clear FEC detected flags\n" );
2243
+ drm_dbg_kms (display -> drm , "Failed to clear FEC detected flags\n" );
2244
2244
}
2245
2245
2246
2246
static int read_fec_detected_status (struct drm_dp_aux * aux )
0 commit comments