drm/i915/display: Disable SAGV on bw init, to force QGV point recalculation

Problem is that on some platforms, we do get QGV point mask in wrong
state on boot. However driver assumes it is set to 0
(i.e all points allowed), however in reality we might get them all
restricted, causing issues.
Lets disable SAGV initially to force proper QGV point state.
If more QGV points are available, driver will recalculate and update
those then after next commit.

v2: - Added trace to see which QGV/PSF GV point is used when SAGV is
      disabled.
v3: - Move force disable function to intel_bw_init in order to initialize
      bw state as well, so that hw/sw are immediately in sync after init.
v4: - Don't try sending PCode request, seems like it is not possible at
      intel_bw_init, however assigning bw->state to be restricted as if
      SAGV is off, still forces driveer to send PCode request anyway on
      next modeset, so the solution still works.
      However we still need to address the case, when no display is
      connected, which anyway requires much more changes.

v5: - Put PCode request back and apply temporary hack to make the
      request succeed(in case if there 2 PSF GV points with same BW, PCode
      accepts only if both points are restricted/unrestricted same time)
    - Fix argument sequence for adl_qgv_bw(Ville Syrjälä)

v6: - Fix wrong platform checks, not to break everything else.

v7: - Split the handling of quplicate QGV/PSF GV points (Vinod)
      Restrict force disable to display version below 14 (Vinod)

v8: - Simplify icl_force_disable_sagv (Vinod)

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240405113533.338553-5-vinod.govindapillai@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index ea294b9ed733d18d3d0eb1fd5ba98f68436390dd..9cbd85126984c90c43ca509f16a6d0ec4b5415d8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -162,7 +162,9 @@ int icl_pcode_restrict_qgv_points(struct drm_i915_private *dev_priv,
                                1);
 
        if (ret < 0) {
-               drm_err(&dev_priv->drm, "Failed to disable qgv points (%d) points: 0x%x\n", ret, points_mask);
+               drm_err(&dev_priv->drm,
+                       "Failed to disable qgv points (0x%x) points: 0x%x\n",
+                       ret, points_mask);
                return ret;
        }
 
@@ -859,6 +861,41 @@ static u16 icl_prepare_qgv_points_mask(struct drm_i915_private *i915,
                 ADLS_PCODE_REQ_PSF_PT(psf_points)) & icl_qgv_points_mask(i915);
 }
 
+static unsigned int icl_max_bw_psf_gv_point_mask(struct drm_i915_private *i915)
+{
+       unsigned int num_psf_gv_points = i915->display.bw.max[0].num_psf_gv_points;
+       unsigned int max_bw_point_mask = 0;
+       unsigned int max_bw = 0;
+       int i;
+
+       for (i = 0; i < num_psf_gv_points; i++) {
+               unsigned int max_data_rate = adl_psf_bw(i915, i);
+
+               if (max_data_rate > max_bw) {
+                       max_bw_point_mask = BIT(i);
+                       max_bw = max_data_rate;
+               }
+       }
+
+       return max_bw_point_mask;
+}
+
+static void icl_force_disable_sagv(struct drm_i915_private *i915,
+                                  struct intel_bw_state *bw_state)
+{
+       unsigned int qgv_points = icl_max_bw_qgv_point_mask(i915, 0);
+       unsigned int psf_points = icl_max_bw_psf_gv_point_mask(i915);
+
+       bw_state->qgv_points_mask = icl_prepare_qgv_points_mask(i915,
+                                                               qgv_points,
+                                                               psf_points);
+
+       drm_dbg_kms(&i915->drm, "Forcing SAGV disable: mask 0x%x\n",
+                   bw_state->qgv_points_mask);
+
+       icl_pcode_restrict_qgv_points(i915, bw_state->qgv_points_mask);
+}
+
 static int mtl_find_qgv_points(struct drm_i915_private *i915,
                               unsigned int data_rate,
                               unsigned int num_active_planes,
@@ -1341,7 +1378,7 @@ static const struct intel_global_state_funcs intel_bw_funcs = {
        .atomic_destroy_state = intel_bw_destroy_state,
 };
 
-int intel_bw_init(struct drm_i915_private *dev_priv)
+int intel_bw_init(struct drm_i915_private *i915)
 {
        struct intel_bw_state *state;
 
@@ -1349,8 +1386,15 @@ int intel_bw_init(struct drm_i915_private *dev_priv)
        if (!state)
                return -ENOMEM;
 
-       intel_atomic_global_obj_init(dev_priv, &dev_priv->display.bw.obj,
+       intel_atomic_global_obj_init(i915, &i915->display.bw.obj,
                                     &state->base, &intel_bw_funcs);
 
+       /*
+        * Limit this only if we have SAGV. And for Display version 14 onwards
+        * sagv is handled though pmdemand requests
+        */
+       if (intel_has_sagv(i915) && IS_DISPLAY_VER(i915, 11, 13))
+               icl_force_disable_sagv(i915, state);
+
        return 0;
 }

diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 8436af8525da638d579ce045a761c4ee65dc47f3..7c6187b4479fc3dfc7f6f67c18709db25f67ccc0 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -70,7 +70,7 @@ static bool skl_needs_memory_bw_wa(struct drm_i915_private *i915)
        return DISPLAY_VER(i915) == 9;
 }
 
-static bool
+bool
 intel_has_sagv(struct drm_i915_private *i915)
 {
        return HAS_SAGV(i915) &&

diff --git a/drivers/gpu/drm/i915/display/skl_watermark.h b/drivers/gpu/drm/i915/display/skl_watermark.h
index ef1a008466bec5931a32662da25f6c7d712e6157..91f92c0e706eddb7083649c647d1644fdedbc463 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_watermark.h
+++ b/drivers/gpu/drm/i915/display/skl_watermark.h
@@ -25,6 +25,7 @@ void intel_sagv_pre_plane_update(struct intel_atomic_state *state);
 void intel_sagv_post_plane_update(struct intel_atomic_state *state);
 bool intel_can_enable_sagv(struct drm_i915_private *i915,
                           const struct intel_bw_state *bw_state);
+bool intel_has_sagv(struct drm_i915_private *i915);
 
 u32 skl_ddb_dbuf_slice_mask(struct drm_i915_private *i915,
                            const struct skl_ddb_entry *entry);