On Tue, Jan 18, 2022 at 12:48:36PM +0200, Stanislav Lisovskiy wrote:
> Sometimes we might need to change the way we calculate
> watermarks, based on which particular plane it is calculated
> for. Thus it would be convenient to pass plane struct to those
> functions.
>
> v2: Pass plane instead of plane_id
>
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
> ---
> .../gpu/drm/i915/display/intel_atomic_plane.c | 2 +-
> .../gpu/drm/i915/display/intel_atomic_plane.h | 3 +++
> drivers/gpu/drm/i915/intel_pm.c | 23 +++++++++++++------
> 3 files changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> index c2c512cd8ec0..d1344e9c06de 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> @@ -373,7 +373,7 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
> old_plane_state, new_plane_state);
> }
>
> -static struct intel_plane *
> +struct intel_plane *
> intel_crtc_get_plane(struct intel_crtc *crtc, enum plane_id plane_id)
> {
> struct drm_i915_private *i915 = to_i915(crtc->base.dev);
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> index 7907f601598e..c1499bb7370e 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> @@ -16,10 +16,13 @@ struct intel_crtc;
> struct intel_crtc_state;
> struct intel_plane;
> struct intel_plane_state;
> +enum plane_id;
>
> unsigned int intel_adjusted_rate(const struct drm_rect *src,
> const struct drm_rect *dst,
> unsigned int rate);
> +struct intel_plane *intel_crtc_get_plane(struct intel_crtc *crtc,
> + enum plane_id plane_id);
> unsigned int intel_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
> const struct intel_plane_state *plane_state);
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 62fde21fac39..dc1203d21c46 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4252,7 +4252,9 @@ static int skl_compute_wm_params(const struct intel_crtc_state *crtc_state,
> u64 modifier, unsigned int rotation,
> u32 plane_pixel_rate, struct skl_wm_params *wp,
> int color_plane);
> +
> static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state,
> + const struct intel_plane *plane,
> int level,
> unsigned int latency,
> const struct skl_wm_params *wp,
> @@ -4261,6 +4263,7 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state,
>
> static unsigned int
> skl_cursor_allocation(const struct intel_crtc_state *crtc_state,
> + const struct intel_plane *plane,
I don't see a reason for having the caller pass this in. We can just
keep it local to this function.
Also we don't usually const these things.
> int num_active)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
> @@ -4279,7 +4282,7 @@ skl_cursor_allocation(const struct intel_crtc_state *crtc_state,
> for (level = 0; level <= max_level; level++) {
> unsigned int latency = dev_priv->wm.skl_latency[level];
>
> - skl_compute_plane_wm(crtc_state, level, latency, &wp, &wm, &wm);
> + skl_compute_plane_wm(crtc_state, plane, level, latency, &wp, &wm, &wm);
> if (wm.min_ddb_alloc == U16_MAX)
> break;
>
> @@ -5124,6 +5127,7 @@ skl_allocate_plane_ddb(struct intel_atomic_state *state,
> intel_atomic_get_new_crtc_state(state, crtc);
> const struct intel_dbuf_state *dbuf_state =
> intel_atomic_get_new_dbuf_state(state);
> + const struct intel_plane *cursor_plane = intel_crtc_get_plane(crtc, PLANE_CURSOR);
Could be just to_intel_plane(crtc->base.cursor)
Apart from that looks OK.
> const struct skl_ddb_entry *alloc = &dbuf_state->ddb[crtc->pipe];
> int num_active = hweight8(dbuf_state->active_pipes);
> u16 alloc_size, start = 0;
> @@ -5153,7 +5157,7 @@ skl_allocate_plane_ddb(struct intel_atomic_state *state,
> return 0;
>
> /* Allocate fixed number of blocks for cursor. */
> - total[PLANE_CURSOR] = skl_cursor_allocation(crtc_state, num_active);
> + total[PLANE_CURSOR] = skl_cursor_allocation(crtc_state, cursor_plane, num_active);
> alloc_size -= total[PLANE_CURSOR];
> crtc_state->wm.skl.plane_ddb_y[PLANE_CURSOR].start =
> alloc->end - total[PLANE_CURSOR];
> @@ -5507,6 +5511,7 @@ static int skl_wm_max_lines(struct drm_i915_private *dev_priv)
> }
>
> static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state,
> + const struct intel_plane *plane,
> int level,
> unsigned int latency,
> const struct skl_wm_params *wp,
> @@ -5634,6 +5639,7 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *crtc_state,
>
> static void
> skl_compute_wm_levels(const struct intel_crtc_state *crtc_state,
> + const struct intel_plane *plane,
> const struct skl_wm_params *wm_params,
> struct skl_wm_level *levels)
> {
> @@ -5645,7 +5651,7 @@ skl_compute_wm_levels(const struct intel_crtc_state *crtc_state,
> struct skl_wm_level *result = &levels[level];
> unsigned int latency = dev_priv->wm.skl_latency[level];
>
> - skl_compute_plane_wm(crtc_state, level, latency,
> + skl_compute_plane_wm(crtc_state, plane, level, latency,
> wm_params, result_prev, result);
>
> result_prev = result;
> @@ -5653,6 +5659,7 @@ skl_compute_wm_levels(const struct intel_crtc_state *crtc_state,
> }
>
> static void tgl_compute_sagv_wm(const struct intel_crtc_state *crtc_state,
> + const struct intel_plane *plane,
> const struct skl_wm_params *wm_params,
> struct skl_plane_wm *plane_wm)
> {
> @@ -5661,7 +5668,7 @@ static void tgl_compute_sagv_wm(const struct intel_crtc_state *crtc_state,
> struct skl_wm_level *levels = plane_wm->wm;
> unsigned int latency = dev_priv->wm.skl_latency[0] + dev_priv->sagv_block_time_us;
>
> - skl_compute_plane_wm(crtc_state, 0, latency,
> + skl_compute_plane_wm(crtc_state, plane, 0, latency,
> wm_params, &levels[0],
> sagv_wm);
> }
> @@ -5736,6 +5743,7 @@ static int skl_build_plane_wm_single(struct intel_crtc_state *crtc_state,
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> struct skl_plane_wm *wm = &crtc_state->wm.skl.raw.planes[plane_id];
> + struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> struct skl_wm_params wm_params;
> int ret;
>
> @@ -5744,13 +5752,13 @@ static int skl_build_plane_wm_single(struct intel_crtc_state *crtc_state,
> if (ret)
> return ret;
>
> - skl_compute_wm_levels(crtc_state, &wm_params, wm->wm);
> + skl_compute_wm_levels(crtc_state, plane, &wm_params, wm->wm);
>
> skl_compute_transition_wm(dev_priv, &wm->trans_wm,
> &wm->wm[0], &wm_params);
>
> if (DISPLAY_VER(dev_priv) >= 12) {
> - tgl_compute_sagv_wm(crtc_state, &wm_params, wm);
> + tgl_compute_sagv_wm(crtc_state, plane, &wm_params, wm);
>
> skl_compute_transition_wm(dev_priv, &wm->sagv.trans_wm,
> &wm->sagv.wm0, &wm_params);
> @@ -5764,6 +5772,7 @@ static int skl_build_plane_wm_uv(struct intel_crtc_state *crtc_state,
> enum plane_id plane_id)
> {
> struct skl_plane_wm *wm = &crtc_state->wm.skl.raw.planes[plane_id];
> + struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> struct skl_wm_params wm_params;
> int ret;
>
> @@ -5775,7 +5784,7 @@ static int skl_build_plane_wm_uv(struct intel_crtc_state *crtc_state,
> if (ret)
> return ret;
>
> - skl_compute_wm_levels(crtc_state, &wm_params, wm->uv_wm);
> + skl_compute_wm_levels(crtc_state, plane, &wm_params, wm->uv_wm);
>
> return 0;
> }
> --
> 2.24.1.485.gad05a3d8e5
--
Ville Syrjälä
Intel
