Commit b84641c0 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Plumb the full atomic state into skl_ddb_add_affected_planes()

skl_ddb_add_affected_planes() needs the full atomic state. Instead
of digging that out from dubious sources plumb it in explicitly.

The wm counterpart (skl_wm_add_affected_planes()) already does
things in the proper way.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240528184945.24083-3-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5010375a
...@@ -2429,12 +2429,14 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb, ...@@ -2429,12 +2429,14 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,
} }
static int static int
skl_ddb_add_affected_planes(const struct intel_crtc_state *old_crtc_state, skl_ddb_add_affected_planes(struct intel_atomic_state *state,
struct intel_crtc_state *new_crtc_state) struct intel_crtc *crtc)
{ {
struct intel_atomic_state *state = to_intel_atomic_state(new_crtc_state->uapi.state); struct drm_i915_private *i915 = to_i915(state->base.dev);
struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc); const struct intel_crtc_state *old_crtc_state =
struct drm_i915_private *i915 = to_i915(crtc->base.dev); intel_atomic_get_old_crtc_state(state, crtc);
struct intel_crtc_state *new_crtc_state =
intel_atomic_get_new_crtc_state(state, crtc);
struct intel_plane *plane; struct intel_plane *plane;
for_each_intel_plane_on_crtc(&i915->drm, crtc, plane) { for_each_intel_plane_on_crtc(&i915->drm, crtc, plane) {
...@@ -2489,7 +2491,6 @@ skl_compute_ddb(struct intel_atomic_state *state) ...@@ -2489,7 +2491,6 @@ skl_compute_ddb(struct intel_atomic_state *state)
struct drm_i915_private *i915 = to_i915(state->base.dev); struct drm_i915_private *i915 = to_i915(state->base.dev);
const struct intel_dbuf_state *old_dbuf_state; const struct intel_dbuf_state *old_dbuf_state;
struct intel_dbuf_state *new_dbuf_state = NULL; struct intel_dbuf_state *new_dbuf_state = NULL;
const struct intel_crtc_state *old_crtc_state;
struct intel_crtc_state *new_crtc_state; struct intel_crtc_state *new_crtc_state;
struct intel_crtc *crtc; struct intel_crtc *crtc;
int ret, i; int ret, i;
...@@ -2577,14 +2578,12 @@ skl_compute_ddb(struct intel_atomic_state *state) ...@@ -2577,14 +2578,12 @@ skl_compute_ddb(struct intel_atomic_state *state)
return ret; return ret;
} }
for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) {
new_crtc_state, i) {
ret = skl_crtc_allocate_plane_ddb(state, crtc); ret = skl_crtc_allocate_plane_ddb(state, crtc);
if (ret) if (ret)
return ret; return ret;
ret = skl_ddb_add_affected_planes(old_crtc_state, ret = skl_ddb_add_affected_planes(state, crtc);
new_crtc_state);
if (ret) if (ret)
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment