[PATCH 07/14] drm/i915/dp: Use intel_display in intel_dp_dsc_max_src_input_bpc()

[Ankit Nautiyal]

Replace struct drm_i915_private with struct intel_display in the helper
intel_dp_dsc_max_src_input_bpc().

Signed-off-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 3767d3870a19..edfe084dca39 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1781,12 +1781,12 @@ intel_dp_compute_link_config_wide(struct intel_dp 
*intel_dp,
 }
 
 static
-int intel_dp_dsc_max_src_input_bpc(struct drm_i915_private *i915)
+int intel_dp_dsc_max_src_input_bpc(struct intel_display *display)
 {
        /* Max DSC Input BPC for ICL is 10 and for TGL+ is 12 */
-       if (DISPLAY_VER(i915) >= 12)
+       if (DISPLAY_VER(display) >= 12)
                return 12;
-       if (DISPLAY_VER(i915) == 11)
+       if (DISPLAY_VER(display) == 11)
                return 10;
 
        return 0;
@@ -1795,12 +1795,12 @@ int intel_dp_dsc_max_src_input_bpc(struct 
drm_i915_private *i915)
 int intel_dp_dsc_compute_max_bpp(const struct intel_connector *connector,
                                 u8 max_req_bpc)
 {
-       struct drm_i915_private *i915 = to_i915(connector->base.dev);
+       struct intel_display *display = to_intel_display(connector);
        int i, num_bpc;
        u8 dsc_bpc[3] = {};
        int dsc_max_bpc;
 
-       dsc_max_bpc = intel_dp_dsc_max_src_input_bpc(i915);
+       dsc_max_bpc = intel_dp_dsc_max_src_input_bpc(display);
 
        if (!dsc_max_bpc)
                return dsc_max_bpc;
@@ -2196,9 +2196,10 @@ bool is_dsc_pipe_bpp_sufficient(struct drm_i915_private 
*i915,
                                struct link_config_limits *limits,
                                int pipe_bpp)
 {
+       struct intel_display *display = to_intel_display(&i915->drm);
        int dsc_max_bpc, dsc_min_bpc, dsc_max_pipe_bpp, dsc_min_pipe_bpp;
 
-       dsc_max_bpc = min(intel_dp_dsc_max_src_input_bpc(i915), 
conn_state->max_requested_bpc);
+       dsc_max_bpc = min(intel_dp_dsc_max_src_input_bpc(display), 
conn_state->max_requested_bpc);
        dsc_min_bpc = intel_dp_dsc_min_src_input_bpc();
 
        dsc_max_pipe_bpp = min(dsc_max_bpc * 3, limits->pipe.max_bpp);
@@ -2238,7 +2239,7 @@ static int intel_dp_dsc_compute_pipe_bpp(struct intel_dp 
*intel_dp,
                                         struct link_config_limits *limits,
                                         int timeslots)
 {
-       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       struct intel_display *display = to_intel_display(intel_dp);
        const struct intel_connector *connector =
                to_intel_connector(conn_state->connector);
        int max_req_bpc = conn_state->max_requested_bpc;
@@ -2259,7 +2260,7 @@ static int intel_dp_dsc_compute_pipe_bpp(struct intel_dp 
*intel_dp,
                }
        }
 
-       dsc_max_bpc = intel_dp_dsc_max_src_input_bpc(i915);
+       dsc_max_bpc = intel_dp_dsc_max_src_input_bpc(display);
        if (!dsc_max_bpc)
                return -EINVAL;
 
-- 
2.45.2