drm/i915: Split plane data_rate into data_rate+data_rate_y

Split the currently combined plane data_rate into the proper
Y vs. CbCr components. This matches how we now track the
plane dbuf allocations, and thus will make the dbuf bandwidth
calculations actually produce the correct numbers for each
dbuf slice.

Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220303191207.27931-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 2dca3122cce0765253fa0d5cdb9a3ff37e67db01..b6c80824aea1a5fb9bdd6200347dacf7ef827920 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -181,29 +181,16 @@ unsigned int intel_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
 }
 
 unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,
-                                  const struct intel_plane_state *plane_state)
+                                  const struct intel_plane_state *plane_state,
+                                  int color_plane)
 {
        const struct drm_framebuffer *fb = plane_state->hw.fb;
-       unsigned int cpp;
-       unsigned int pixel_rate;
 
        if (!plane_state->uapi.visible)
                return 0;
 
-       pixel_rate = intel_plane_pixel_rate(crtc_state, plane_state);
-
-       cpp = fb->format->cpp[0];
-
-       /*
-        * Based on HSD#:1408715493
-        * NV12 cpp == 4, P010 cpp == 8
-        *
-        * FIXME what is the logic behind this?
-        */
-       if (fb->format->is_yuv && fb->format->num_planes > 1)
-               cpp *= 4;
-
-       return pixel_rate * cpp;
+       return intel_plane_pixel_rate(crtc_state, plane_state) *
+               fb->format->cpp[color_plane];
 }
 
 int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
@@ -326,6 +313,7 @@ void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
        crtc_state->nv12_planes &= ~BIT(plane->id);
        crtc_state->c8_planes &= ~BIT(plane->id);
        crtc_state->data_rate[plane->id] = 0;
+       crtc_state->data_rate_y[plane->id] = 0;
        crtc_state->min_cdclk[plane->id] = 0;
 
        plane_state->uapi.visible = false;
@@ -551,8 +539,16 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
        if (new_plane_state->uapi.visible || old_plane_state->uapi.visible)
                new_crtc_state->update_planes |= BIT(plane->id);
 
-       new_crtc_state->data_rate[plane->id] =
-               intel_plane_data_rate(new_crtc_state, new_plane_state);
+       if (new_plane_state->uapi.visible &&
+           intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier)) {
+               new_crtc_state->data_rate_y[plane->id] =
+                       intel_plane_data_rate(new_crtc_state, new_plane_state, 0);
+               new_crtc_state->data_rate[plane->id] =
+                       intel_plane_data_rate(new_crtc_state, new_plane_state, 1);
+       } else if (new_plane_state->uapi.visible) {
+               new_crtc_state->data_rate[plane->id] =
+                       intel_plane_data_rate(new_crtc_state, new_plane_state, 0);
+       }
 
        return intel_plane_atomic_calc_changes(old_crtc_state, new_crtc_state,
                                               old_plane_state, new_plane_state);

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
index f4763a53541e2371c3d4791f2a93577747e6e659..74b6d3b169a72d8faa9dc60a428750b0b46a3107 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
@@ -25,7 +25,8 @@ unsigned int intel_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
                                    const struct intel_plane_state *plane_state);
 
 unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,
-                                  const struct intel_plane_state *plane_state);
+                                  const struct intel_plane_state *plane_state,
+                                  int color_plane);
 void intel_plane_copy_uapi_to_hw_state(struct intel_plane_state *plane_state,
                                       const struct intel_plane_state *from_plane_state,
                                       struct intel_crtc *crtc);

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index baa9b1d7ab6cc91e7a3a8f36de77ef68d62d92bd..5517d1ac78d6de9a2f61bae2c0a5e163cd326475 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -578,6 +578,7 @@ static unsigned int intel_bw_crtc_num_active_planes(const struct intel_crtc_stat
 static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
        unsigned int data_rate = 0;
        enum plane_id plane_id;
 
@@ -590,6 +591,9 @@ static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_
                        continue;
 
                data_rate += crtc_state->data_rate[plane_id];
+
+               if (DISPLAY_VER(i915) < 11)
+                       data_rate += crtc_state->data_rate_y[plane_id];
        }
 
        return data_rate;
@@ -690,28 +694,24 @@ static void skl_crtc_calc_dbuf_bw(struct intel_bw_state *bw_state,
        for_each_plane_id_on_crtc(crtc, plane_id) {
                const struct skl_ddb_entry *ddb =
                        &crtc_state->wm.skl.plane_ddb[plane_id];
-               const struct skl_ddb_entry *ddb_y =
-                       &crtc_state->wm.skl.plane_ddb_y[plane_id];
                unsigned int data_rate = crtc_state->data_rate[plane_id];
-               unsigned int dbuf_mask = 0;
+               unsigned int dbuf_mask = skl_ddb_dbuf_slice_mask(i915, ddb);
                enum dbuf_slice slice;
 
-               dbuf_mask |= skl_ddb_dbuf_slice_mask(i915, ddb);
-               dbuf_mask |= skl_ddb_dbuf_slice_mask(i915, ddb_y);
+               for_each_dbuf_slice_in_mask(i915, slice, dbuf_mask)
+                       crtc_bw->used_bw[slice] += data_rate;
+       }
+
+       if (DISPLAY_VER(i915) >= 11)
+               return;
+
+       for_each_plane_id_on_crtc(crtc, plane_id) {
+               const struct skl_ddb_entry *ddb =
+                       &crtc_state->wm.skl.plane_ddb_y[plane_id];
+               unsigned int data_rate = crtc_state->data_rate_y[plane_id];
+               unsigned int dbuf_mask = skl_ddb_dbuf_slice_mask(i915, ddb);
+               enum dbuf_slice slice;
 
-               /*
-                * FIXME: To calculate that more properly we probably
-                * need to split per plane data_rate into data_rate_y
-                * and data_rate_uv for multiplanar formats in order not
-                * to get accounted those twice if they happen to reside
-                * on different slices.
-                * However for pre-icl this would work anyway because
-                * we have only single slice and for icl+ uv plane has
-                * non-zero data rate.
-                * So in worst case those calculation are a bit
-                * pessimistic, which shouldn't pose any significant
-                * problem anyway.
-                */
                for_each_dbuf_slice_in_mask(i915, slice, dbuf_mask)
                        crtc_bw->used_bw[slice] += data_rate;
        }

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index c138972a2befef72adb215c925fd813888cf9f8f..853f943d5138d66ff4789a98faf6249b0549d7bb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -780,6 +780,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
        intel_set_plane_visible(crtc_state, plane_state, false);
        fixup_plane_bitmasks(crtc_state);
        crtc_state->data_rate[plane->id] = 0;
+       crtc_state->data_rate_y[plane->id] = 0;
        crtc_state->min_cdclk[plane->id] = 0;
 
        if ((crtc_state->active_planes & ~BIT(PLANE_CURSOR)) == 0 &&
@@ -4813,6 +4814,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
                        crtc_state->enabled_planes &= ~BIT(plane->id);
                        crtc_state->active_planes &= ~BIT(plane->id);
                        crtc_state->update_planes |= BIT(plane->id);
+                       crtc_state->data_rate[plane->id] = 0;
                }
 
                plane_state->planar_slave = false;
@@ -4857,6 +4859,8 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
                crtc_state->enabled_planes |= BIT(linked->id);
                crtc_state->active_planes |= BIT(linked->id);
                crtc_state->update_planes |= BIT(linked->id);
+               crtc_state->data_rate[linked->id] =
+                       crtc_state->data_rate_y[plane->id];
                drm_dbg_kms(&dev_priv->drm, "Using %s as Y plane for %s\n",
                            linked->base.name, plane->base.name);
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 71d5a9eb8706fc07417801f35efd09f45b6b23dd..55ce91e4bb71e01c61a7d574431643796e3a06b2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1129,7 +1129,10 @@ struct intel_crtc_state {
 
        int min_cdclk[I915_MAX_PLANES];
 
+       /* for packed/planar CbCr */
        u32 data_rate[I915_MAX_PLANES];
+       /* for planar Y */
+       u32 data_rate_y[I915_MAX_PLANES];
 
        /* FIXME unify with data_rate[] */
        u64 plane_data_rate[I915_MAX_PLANES];