1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index 753ac3165061..7b908e10d32e 100644
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -178,6 +178,8 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv)
                 clpchgroup = (sa->deburst * deinterleave / num_channels) << i;
                 bi->num_planes = (ipqdepth - clpchgroup) / clpchgroup + 1;
 
+                bi->num_qgv_points = qi.num_points;
+
                 for (j = 0; j < qi.num_points; j++) {
                         const struct intel_qgv_point *sp = &qi.points[j];
                         int ct, bw;
@@ -195,7 +197,7 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv)
                         bi->deratedbw[j] = min(maxdebw,
                                                bw * 9 / 10); /* 90% */
 
-                        DRM_DEBUG_KMS("BW%d / QGV %d: num_planes=%d deratedbw=%d\n",
+                        DRM_DEBUG_KMS("BW%d / QGV %d: num_planes=%d deratedbw=%u\n",
                                       i, j, bi->num_planes, bi->deratedbw[j]);
                 }
 
@@ -211,14 +213,17 @@ static unsigned int icl_max_bw(struct drm_i915_private *dev_priv,
 {
         int i;
 
-        /* Did we initialize the bw limits successfully? */
-        if (dev_priv->max_bw[0].num_planes == 0)
-                return UINT_MAX;
-
         for (i = 0; i < ARRAY_SIZE(dev_priv->max_bw); i++) {
                 const struct intel_bw_info *bi =
                         &dev_priv->max_bw[i];
 
+                /*
+                 * Pcode will not expose all QGV points when
+                 * SAGV is forced to off/min/med/max.
+                 */
+                if (qgv_point >= bi->num_qgv_points)
+                        return UINT_MAX;
+
                 if (num_planes >= bi->num_planes)
                         return bi->deratedbw[qgv_point];
         }