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ä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6557281bc3f8df88931c045deb08cf76b727cda2.1725012870.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 25ff3ff0ab95d01c6ae4751398f7f3dfdd1b77a2..00fbe9f8c03a94f4ac33519d6a45c3011c6dce73 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1400,7 +1400,7 @@ static void tgl_dkl_phy_set_signal_levels(struct intel_encoder *encoder,
 static int translate_signal_level(struct intel_dp *intel_dp,
                                  u8 signal_levels)
 {
-       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       struct intel_display *display = to_intel_display(intel_dp);
        int i;
 
        for (i = 0; i < ARRAY_SIZE(index_to_dp_signal_levels); i++) {
@@ -1408,7 +1408,7 @@ static int translate_signal_level(struct intel_dp *intel_dp,
                        return i;
        }
 
-       drm_WARN(&i915->drm, 1,
+       drm_WARN(display->drm, 1,
                 "Unsupported voltage swing/pre-emphasis level: 0x%x\n",
                 signal_levels);
 
@@ -2211,14 +2211,14 @@ static void intel_dp_sink_set_msa_timing_par_ignore_state(struct intel_dp *intel
                                                          const struct intel_crtc_state *crtc_state,
                                                          bool enable)
 {
-       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       struct intel_display *display = to_intel_display(intel_dp);
 
        if (!crtc_state->vrr.enable)
                return;
 
        if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_DOWNSPREAD_CTRL,
                               enable ? DP_MSA_TIMING_PAR_IGNORE_EN : 0) <= 0)
-               drm_dbg_kms(&i915->drm,
+               drm_dbg_kms(display->drm,
                            "Failed to %s MSA_TIMING_PAR_IGNORE in the sink\n",
                            str_enable_disable(enable));
 }
@@ -2227,20 +2227,20 @@ static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,
                                        const struct intel_crtc_state *crtc_state,
                                        bool enable)
 {
-       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       struct intel_display *display = to_intel_display(intel_dp);
 
        if (!crtc_state->fec_enable)
                return;
 
        if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_FEC_CONFIGURATION,
                               enable ? DP_FEC_READY : 0) <= 0)
-               drm_dbg_kms(&i915->drm, "Failed to set FEC_READY to %s in the sink\n",
+               drm_dbg_kms(display->drm, "Failed to set FEC_READY to %s in the sink\n",
                            enable ? "enabled" : "disabled");
 
        if (enable &&
            drm_dp_dpcd_writeb(&intel_dp->aux, DP_FEC_STATUS,
                               DP_FEC_DECODE_EN_DETECTED | DP_FEC_DECODE_DIS_DETECTED) <= 0)
-               drm_dbg_kms(&i915->drm, "Failed to clear FEC detected flags\n");
+               drm_dbg_kms(display->drm, "Failed to clear FEC detected flags\n");
 }
 
 static int read_fec_detected_status(struct drm_dp_aux *aux)