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

drm/i915/dsb: Plumb the whole atomic state into intel_dsb_prepare()

The DSB code will need to examine both the old and new crtc
states. Pass in the whole atomic state so we can dig up
what we need.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611133344.30673-7-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 42c8065d
...@@ -1919,7 +1919,7 @@ void intel_color_prepare_commit(struct intel_atomic_state *state, ...@@ -1919,7 +1919,7 @@ void intel_color_prepare_commit(struct intel_atomic_state *state,
if (!crtc_state->pre_csc_lut && !crtc_state->post_csc_lut) if (!crtc_state->pre_csc_lut && !crtc_state->post_csc_lut)
return; return;
crtc_state->dsb = intel_dsb_prepare(crtc_state, INTEL_DSB_0, 1024); crtc_state->dsb = intel_dsb_prepare(state, crtc, INTEL_DSB_0, 1024);
if (!crtc_state->dsb) if (!crtc_state->dsb)
return; return;
......
...@@ -434,7 +434,8 @@ void intel_dsb_wait(struct intel_dsb *dsb) ...@@ -434,7 +434,8 @@ void intel_dsb_wait(struct intel_dsb *dsb)
/** /**
* intel_dsb_prepare() - Allocate, pin and map the DSB command buffer. * intel_dsb_prepare() - Allocate, pin and map the DSB command buffer.
* @crtc_state: the CRTC state * @state: the atomic state
* @crtc: the CRTC
* @dsb_id: the DSB engine to use * @dsb_id: the DSB engine to use
* @max_cmds: number of commands we need to fit into command buffer * @max_cmds: number of commands we need to fit into command buffer
* *
...@@ -444,12 +445,14 @@ void intel_dsb_wait(struct intel_dsb *dsb) ...@@ -444,12 +445,14 @@ void intel_dsb_wait(struct intel_dsb *dsb)
* Returns: * Returns:
* DSB context, NULL on failure * DSB context, NULL on failure
*/ */
struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, struct intel_dsb *intel_dsb_prepare(struct intel_atomic_state *state,
struct intel_crtc *crtc,
enum intel_dsb_id dsb_id, enum intel_dsb_id dsb_id,
unsigned int max_cmds) unsigned int max_cmds)
{ {
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct drm_i915_private *i915 = to_i915(state->base.dev);
struct drm_i915_private *i915 = to_i915(crtc->base.dev); const struct intel_crtc_state *crtc_state =
intel_atomic_get_new_crtc_state(state, crtc);
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
struct intel_dsb *dsb; struct intel_dsb *dsb;
unsigned int size; unsigned int size;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "i915_reg_defs.h" #include "i915_reg_defs.h"
struct intel_atomic_state;
struct intel_crtc; struct intel_crtc;
struct intel_crtc_state; struct intel_crtc_state;
struct intel_dsb; struct intel_dsb;
...@@ -22,7 +23,8 @@ enum intel_dsb_id { ...@@ -22,7 +23,8 @@ enum intel_dsb_id {
I915_MAX_DSBS, I915_MAX_DSBS,
}; };
struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, struct intel_dsb *intel_dsb_prepare(struct intel_atomic_state *state,
struct intel_crtc *crtc,
enum intel_dsb_id dsb_id, enum intel_dsb_id dsb_id,
unsigned int max_cmds); unsigned int max_cmds);
void intel_dsb_finish(struct intel_dsb *dsb); void intel_dsb_finish(struct intel_dsb *dsb);
......
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