Skip to content

Commit 7134cc2

Browse files
committed
drm/i915/ddi: stop using dp_to_i915()
Switch to struct intel_display and to_intel_display() instead of using dp_to_i915(). Reviewed-by: Ville Syrjälä <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/6557281bc3f8df88931c045deb08cf76b727cda2.1725012870.git.jani.nikula@intel.com
1 parent 41a4629 commit 7134cc2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,15 +1400,15 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder,
14001400
static int translate_signal_level(struct intel_dp *intel_dp,
14011401
u8 signal_levels)
14021402
{
1403-
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
1403+
struct intel_display *display = to_intel_display(intel_dp);
14041404
int i;
14051405

14061406
for (i = 0; i < ARRAY_SIZE(index_to_dp_signal_levels); i++) {
14071407
if (index_to_dp_signal_levels[i] == signal_levels)
14081408
return i;
14091409
}
14101410

1411-
drm_WARN(&i915->drm, 1,
1411+
drm_WARN(display->drm, 1,
14121412
"Unsupported voltage swing/pre-emphasis level: 0x%x\n",
14131413
signal_levels);
14141414

@@ -2211,14 +2211,14 @@ static void intel_dp_sink_set_msa_timing_par_ignore_state(struct intel_dp *intel
22112211
const struct intel_crtc_state *crtc_state,
22122212
bool enable)
22132213
{
2214-
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
2214+
struct intel_display *display = to_intel_display(intel_dp);
22152215

22162216
if (!crtc_state->vrr.enable)
22172217
return;
22182218

22192219
if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_DOWNSPREAD_CTRL,
22202220
enable ? DP_MSA_TIMING_PAR_IGNORE_EN : 0) <= 0)
2221-
drm_dbg_kms(&i915->drm,
2221+
drm_dbg_kms(display->drm,
22222222
"Failed to %s MSA_TIMING_PAR_IGNORE in the sink\n",
22232223
str_enable_disable(enable));
22242224
}
@@ -2227,20 +2227,20 @@ static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,
22272227
const struct intel_crtc_state *crtc_state,
22282228
bool enable)
22292229
{
2230-
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
2230+
struct intel_display *display = to_intel_display(intel_dp);
22312231

22322232
if (!crtc_state->fec_enable)
22332233
return;
22342234

22352235
if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_FEC_CONFIGURATION,
22362236
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",
22382238
enable ? "enabled" : "disabled");
22392239

22402240
if (enable &&
22412241
drm_dp_dpcd_writeb(&intel_dp->aux, DP_FEC_STATUS,
22422242
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");
22442244
}
22452245

22462246
static int read_fec_detected_status(struct drm_dp_aux *aux)

0 commit comments

Comments
 (0)