[PATCH 10/19] drm/i915/dss: Use struct intel_display in dss dsc helpers

[Ankit Nautiyal]

Replace struct drm_i915_private with intel_display in the dss dsc
helpers.

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

diff --git a/drivers/gpu/drm/i915/display/intel_dss.c 
b/drivers/gpu/drm/i915/display/intel_dss.c
index b37e9112ab77..fe55f4b1a9bf 100644
--- a/drivers/gpu/drm/i915/display/intel_dss.c
+++ b/drivers/gpu/drm/i915/display/intel_dss.c
@@ -154,17 +154,17 @@ static i915_reg_t dss_ctl2_reg(struct intel_crtc *crtc, 
enum transcoder cpu_tran
 
 void intel_dss_reset(const struct intel_crtc_state *old_crtc_state)
 {
+       struct intel_display *display = to_intel_display(old_crtc_state);
        struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 
-       intel_de_write(dev_priv, dss_ctl1_reg(crtc, 
old_crtc_state->cpu_transcoder), 0);
-       intel_de_write(dev_priv, dss_ctl2_reg(crtc, 
old_crtc_state->cpu_transcoder), 0);
+       intel_de_write(display, dss_ctl1_reg(crtc, 
old_crtc_state->cpu_transcoder), 0);
+       intel_de_write(display, dss_ctl2_reg(crtc, 
old_crtc_state->cpu_transcoder), 0);
 }
 
 void intel_dss_enable_uncompressed_joiner(const struct intel_crtc_state 
*crtc_state)
 {
+       struct intel_display *display = to_intel_display(crtc_state);
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        u32 dss_ctl1_val = 0;
 
        if (crtc_state->joiner_pipes && !crtc_state->dsc.compression_enable) {
@@ -173,7 +173,7 @@ void intel_dss_enable_uncompressed_joiner(const struct 
intel_crtc_state *crtc_st
                else
                        dss_ctl1_val |= UNCOMPRESSED_JOINER_PRIMARY;
 
-               intel_de_write(dev_priv,
+               intel_de_write(display,
                               dss_ctl1_reg(crtc, crtc_state->cpu_transcoder),
                               dss_ctl1_val);
        }
@@ -182,8 +182,8 @@ void intel_dss_enable_uncompressed_joiner(const struct 
intel_crtc_state *crtc_st
 void intel_dss_enable_compressed_joiner(const struct intel_crtc_state 
*crtc_state,
                                        int vdsc_instances_per_pipe)
 {
+       struct intel_display *display = to_intel_display(crtc_state);
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        u32 dss_ctl1_val = 0;
        u32 dss_ctl2_val = 0;
 
@@ -197,18 +197,18 @@ void intel_dss_enable_compressed_joiner(const struct 
intel_crtc_state *crtc_stat
                if (!intel_crtc_is_joiner_secondary(crtc_state))
                        dss_ctl1_val |= PRIMARY_BIG_JOINER_ENABLE;
        }
-       intel_de_write(dev_priv, dss_ctl1_reg(crtc, 
crtc_state->cpu_transcoder), dss_ctl1_val);
-       intel_de_write(dev_priv, dss_ctl2_reg(crtc, 
crtc_state->cpu_transcoder), dss_ctl2_val);
+       intel_de_write(display, dss_ctl1_reg(crtc, crtc_state->cpu_transcoder), 
dss_ctl1_val);
+       intel_de_write(display, dss_ctl2_reg(crtc, crtc_state->cpu_transcoder), 
dss_ctl2_val);
 }
 
 void intel_dss_dsc_get_config(struct intel_crtc_state *crtc_state)
 {
+       struct intel_display *display = to_intel_display(crtc_state);
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        u32 dss_ctl1, dss_ctl2;
 
-       dss_ctl1 = intel_de_read(dev_priv, dss_ctl1_reg(crtc, 
crtc_state->cpu_transcoder));
-       dss_ctl2 = intel_de_read(dev_priv, dss_ctl2_reg(crtc, 
crtc_state->cpu_transcoder));
+       dss_ctl1 = intel_de_read(display, dss_ctl1_reg(crtc, 
crtc_state->cpu_transcoder));
+       dss_ctl2 = intel_de_read(display, dss_ctl2_reg(crtc, 
crtc_state->cpu_transcoder));
 
        crtc_state->dsc.compression_enable = dss_ctl2 & LEFT_BRANCH_VDSC_ENABLE;
        if (!crtc_state->dsc.compression_enable)
-- 
2.45.2