drm/i915: move and group sagv under display.sagv

Move display sagv related members under drm_i915_private display
sub-struct.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d67c632f6bc75f6ce562c28f3521404d30ed48f4.1661346845.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index 487af5a..c87bc31 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -378,9 +378,9 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel
         * as it will fail and pointless anyway.
         */
        if (qi.num_points == 1)
-               dev_priv->sagv_status = I915_SAGV_NOT_CONTROLLED;
+               dev_priv->display.sagv.status = I915_SAGV_NOT_CONTROLLED;
        else
-               dev_priv->sagv_status = I915_SAGV_ENABLED;
+               dev_priv->display.sagv.status = I915_SAGV_ENABLED;
 
        return 0;
 }
@@ -490,9 +490,9 @@ static int tgl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel
         * as it will fail and pointless anyway.
         */
        if (qi.num_points == 1)
-               dev_priv->sagv_status = I915_SAGV_NOT_CONTROLLED;
+               dev_priv->display.sagv.status = I915_SAGV_NOT_CONTROLLED;
        else
-               dev_priv->sagv_status = I915_SAGV_ENABLED;
+               dev_priv->display.sagv.status = I915_SAGV_ENABLED;
 
        return 0;
 }
@@ -519,7 +519,7 @@ static void dg2_get_bw_info(struct drm_i915_private *i915)
                bi->deratedbw[0] = deratedbw;
        }
 
-       i915->sagv_status = I915_SAGV_NOT_CONTROLLED;
+       i915->display.sagv.status = I915_SAGV_NOT_CONTROLLED;
 }
 
 static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 8126310..fbe329e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -238,6 +238,17 @@ struct intel_display {
                struct mutex mutex;
        } pps;
 
+       struct {
+               enum {
+                       I915_SAGV_UNKNOWN = 0,
+                       I915_SAGV_DISABLED,
+                       I915_SAGV_ENABLED,
+                       I915_SAGV_NOT_CONTROLLED
+               } status;
+
+               u32 block_time_us;
+       } sagv;
+
        /* Grouping using named structs. Keep sorted. */
        struct intel_audio audio;
        struct intel_dmc dmc;

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b747455..78ade0c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -451,15 +451,6 @@ struct drm_i915_private {
        struct i915_suspend_saved_registers regfile;
        struct vlv_s0ix_state *vlv_s0ix_state;
 
-       enum {
-               I915_SAGV_UNKNOWN = 0,
-               I915_SAGV_DISABLED,
-               I915_SAGV_ENABLED,
-               I915_SAGV_NOT_CONTROLLED
-       } sagv_status;
-
-       u32 sagv_block_time_us;
-
        struct dram_info {
                bool wm_lv_0_adjust_needed;
                u8 num_channels;

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index fd42d1d..c54b8b9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3692,7 +3692,7 @@ static bool
 intel_has_sagv(struct drm_i915_private *dev_priv)
 {
        return DISPLAY_VER(dev_priv) >= 9 && !IS_LP(dev_priv) &&
-               dev_priv->sagv_status != I915_SAGV_NOT_CONTROLLED;
+               dev_priv->display.sagv.status != I915_SAGV_NOT_CONTROLLED;
 }
 
 static u32
@@ -3723,7 +3723,7 @@ intel_sagv_block_time(struct drm_i915_private *dev_priv)
 static void intel_sagv_init(struct drm_i915_private *i915)
 {
        if (!intel_has_sagv(i915))
-               i915->sagv_status = I915_SAGV_NOT_CONTROLLED;
+               i915->display.sagv.status = I915_SAGV_NOT_CONTROLLED;
 
        /*
         * Probe to see if we have working SAGV control.
@@ -3732,21 +3732,21 @@ static void intel_sagv_init(struct drm_i915_private *i915)
        if (DISPLAY_VER(i915) < 11)
                skl_sagv_disable(i915);
 
-       drm_WARN_ON(&i915->drm, i915->sagv_status == I915_SAGV_UNKNOWN);
+       drm_WARN_ON(&i915->drm, i915->display.sagv.status == I915_SAGV_UNKNOWN);
 
-       i915->sagv_block_time_us = intel_sagv_block_time(i915);
+       i915->display.sagv.block_time_us = intel_sagv_block_time(i915);
 
        drm_dbg_kms(&i915->drm, "SAGV supported: %s, original SAGV block time: %u us\n",
-                   str_yes_no(intel_has_sagv(i915)), i915->sagv_block_time_us);
+                   str_yes_no(intel_has_sagv(i915)), i915->display.sagv.block_time_us);
 
        /* avoid overflow when adding with wm0 latency/etc. */
-       if (drm_WARN(&i915->drm, i915->sagv_block_time_us > U16_MAX,
+       if (drm_WARN(&i915->drm, i915->display.sagv.block_time_us > U16_MAX,
                     "Excessive SAGV block time %u, ignoring\n",
-                    i915->sagv_block_time_us))
-               i915->sagv_block_time_us = 0;
+                    i915->display.sagv.block_time_us))
+               i915->display.sagv.block_time_us = 0;
 
        if (!intel_has_sagv(i915))
-               i915->sagv_block_time_us = 0;
+               i915->display.sagv.block_time_us = 0;
 }
 
 /*
@@ -3767,7 +3767,7 @@ static void skl_sagv_enable(struct drm_i915_private *dev_priv)
        if (!intel_has_sagv(dev_priv))
                return;
 
-       if (dev_priv->sagv_status == I915_SAGV_ENABLED)
+       if (dev_priv->display.sagv.status == I915_SAGV_ENABLED)
                return;
 
        drm_dbg_kms(&dev_priv->drm, "Enabling SAGV\n");
@@ -3782,14 +3782,14 @@ static void skl_sagv_enable(struct drm_i915_private *dev_priv)
         */
        if (IS_SKYLAKE(dev_priv) && ret == -ENXIO) {
                drm_dbg(&dev_priv->drm, "No SAGV found on system, ignoring\n");
-               dev_priv->sagv_status = I915_SAGV_NOT_CONTROLLED;
+               dev_priv->display.sagv.status = I915_SAGV_NOT_CONTROLLED;
                return;
        } else if (ret < 0) {
                drm_err(&dev_priv->drm, "Failed to enable SAGV\n");
                return;
        }
 
-       dev_priv->sagv_status = I915_SAGV_ENABLED;
+       dev_priv->display.sagv.status = I915_SAGV_ENABLED;
 }
 
 static void skl_sagv_disable(struct drm_i915_private *dev_priv)
@@ -3799,7 +3799,7 @@ static void skl_sagv_disable(struct drm_i915_private *dev_priv)
        if (!intel_has_sagv(dev_priv))
                return;
 
-       if (dev_priv->sagv_status == I915_SAGV_DISABLED)
+       if (dev_priv->display.sagv.status == I915_SAGV_DISABLED)
                return;
 
        drm_dbg_kms(&dev_priv->drm, "Disabling SAGV\n");
@@ -3814,14 +3814,14 @@ static void skl_sagv_disable(struct drm_i915_private *dev_priv)
         */
        if (IS_SKYLAKE(dev_priv) && ret == -ENXIO) {
                drm_dbg(&dev_priv->drm, "No SAGV found on system, ignoring\n");
-               dev_priv->sagv_status = I915_SAGV_NOT_CONTROLLED;
+               dev_priv->display.sagv.status = I915_SAGV_NOT_CONTROLLED;
                return;
        } else if (ret < 0) {
                drm_err(&dev_priv->drm, "Failed to disable SAGV (%d)\n", ret);
                return;
        }
 
-       dev_priv->sagv_status = I915_SAGV_DISABLED;
+       dev_priv->display.sagv.status = I915_SAGV_DISABLED;
 }
 
 static void skl_sagv_pre_plane_update(struct intel_atomic_state *state)
@@ -5583,8 +5583,8 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state,
        result->min_ddb_alloc = max(min_ddb_alloc, blocks) + 1;
        result->enable = true;
 
-       if (DISPLAY_VER(dev_priv) < 12 && dev_priv->sagv_block_time_us)
-               result->can_sagv = latency >= dev_priv->sagv_block_time_us;
+       if (DISPLAY_VER(dev_priv) < 12 && dev_priv->display.sagv.block_time_us)
+               result->can_sagv = latency >= dev_priv->display.sagv.block_time_us;
 }
 
 static void
@@ -5618,8 +5618,8 @@ static void tgl_compute_sagv_wm(const struct intel_crtc_state *crtc_state,
        struct skl_wm_level *levels = plane_wm->wm;
        unsigned int latency = 0;
 
-       if (dev_priv->sagv_block_time_us)
-               latency = dev_priv->sagv_block_time_us + dev_priv->display.wm.skl_latency[0];
+       if (dev_priv->display.sagv.block_time_us)
+               latency = dev_priv->display.sagv.block_time_us + dev_priv->display.wm.skl_latency[0];
 
        skl_compute_plane_wm(crtc_state, plane, 0, latency,
                             wm_params, &levels[0],