Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Stanislav Lisovskiy and committed by
Vinod Govindapillai
9299cde9 f09f9517

+49 -4
+47 -3
drivers/gpu/drm/i915/display/intel_bw.c
··· 162 162 1); 163 163 164 164 if (ret < 0) { 165 - drm_err(&dev_priv->drm, "Failed to disable qgv points (%d) points: 0x%x\n", ret, points_mask); 165 + drm_err(&dev_priv->drm, 166 + "Failed to disable qgv points (0x%x) points: 0x%x\n", 167 + ret, points_mask); 166 168 return ret; 167 169 } 168 170 ··· 861 859 ADLS_PCODE_REQ_PSF_PT(psf_points)) & icl_qgv_points_mask(i915); 862 860 } 863 861 862 + static unsigned int icl_max_bw_psf_gv_point_mask(struct drm_i915_private *i915) 863 + { 864 + unsigned int num_psf_gv_points = i915->display.bw.max[0].num_psf_gv_points; 865 + unsigned int max_bw_point_mask = 0; 866 + unsigned int max_bw = 0; 867 + int i; 868 + 869 + for (i = 0; i < num_psf_gv_points; i++) { 870 + unsigned int max_data_rate = adl_psf_bw(i915, i); 871 + 872 + if (max_data_rate > max_bw) { 873 + max_bw_point_mask = BIT(i); 874 + max_bw = max_data_rate; 875 + } 876 + } 877 + 878 + return max_bw_point_mask; 879 + } 880 + 881 + static void icl_force_disable_sagv(struct drm_i915_private *i915, 882 + struct intel_bw_state *bw_state) 883 + { 884 + unsigned int qgv_points = icl_max_bw_qgv_point_mask(i915, 0); 885 + unsigned int psf_points = icl_max_bw_psf_gv_point_mask(i915); 886 + 887 + bw_state->qgv_points_mask = icl_prepare_qgv_points_mask(i915, 888 + qgv_points, 889 + psf_points); 890 + 891 + drm_dbg_kms(&i915->drm, "Forcing SAGV disable: mask 0x%x\n", 892 + bw_state->qgv_points_mask); 893 + 894 + icl_pcode_restrict_qgv_points(i915, bw_state->qgv_points_mask); 895 + } 896 + 864 897 static int mtl_find_qgv_points(struct drm_i915_private *i915, 865 898 unsigned int data_rate, 866 899 unsigned int num_active_planes, ··· 1378 1341 .atomic_destroy_state = intel_bw_destroy_state, 1379 1342 }; 1380 1343 1381 - int intel_bw_init(struct drm_i915_private *dev_priv) 1344 + int intel_bw_init(struct drm_i915_private *i915) 1382 1345 { 1383 1346 struct intel_bw_state *state; 1384 1347 ··· 1386 1349 if (!state) 1387 1350 return -ENOMEM; 1388 1351 1389 - intel_atomic_global_obj_init(dev_priv, &dev_priv->display.bw.obj, 1352 + intel_atomic_global_obj_init(i915, &i915->display.bw.obj, 1390 1353 &state->base, &intel_bw_funcs); 1354 + 1355 + /* 1356 + * Limit this only if we have SAGV. And for Display version 14 onwards 1357 + * sagv is handled though pmdemand requests 1358 + */ 1359 + if (intel_has_sagv(i915) && IS_DISPLAY_VER(i915, 11, 13)) 1360 + icl_force_disable_sagv(i915, state); 1391 1361 1392 1362 return 0; 1393 1363 }
+1 -1
drivers/gpu/drm/i915/display/skl_watermark.c
··· 70 70 return DISPLAY_VER(i915) == 9; 71 71 } 72 72 73 - static bool 73 + bool 74 74 intel_has_sagv(struct drm_i915_private *i915) 75 75 { 76 76 return HAS_SAGV(i915) &&
+1
drivers/gpu/drm/i915/display/skl_watermark.h
··· 25 25 void intel_sagv_post_plane_update(struct intel_atomic_state *state); 26 26 bool intel_can_enable_sagv(struct drm_i915_private *i915, 27 27 const struct intel_bw_state *bw_state); 28 + bool intel_has_sagv(struct drm_i915_private *i915); 28 29 29 30 u32 skl_ddb_dbuf_slice_mask(struct drm_i915_private *i915, 30 31 const struct skl_ddb_entry *entry);