Commit 81d604f4 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/dsb: Pass DSB engine ID to intel_dsb_prepare()

Allow the caller of intel_dsb_prepare() to determine which DSB
engine (out of the three possible per pipe) to use. This will
let us utilize multiple DSB engines during the same commit.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240531114101.19994-4-ville.syrjala@linux.intel.comReviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 738f3d86
...@@ -1914,7 +1914,7 @@ void intel_color_prepare_commit(struct intel_crtc_state *crtc_state) ...@@ -1914,7 +1914,7 @@ void intel_color_prepare_commit(struct intel_crtc_state *crtc_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, 1024); crtc_state->dsb = intel_dsb_prepare(crtc_state, INTEL_DSB_0, 1024);
if (!crtc_state->dsb) if (!crtc_state->dsb)
return; return;
......
...@@ -435,6 +435,7 @@ void intel_dsb_wait(struct intel_dsb *dsb) ...@@ -435,6 +435,7 @@ 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 * @crtc_state: the CRTC state
* @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
* *
* This function prepare the command buffer which is used to store dsb * This function prepare the command buffer which is used to store dsb
...@@ -444,6 +445,7 @@ void intel_dsb_wait(struct intel_dsb *dsb) ...@@ -444,6 +445,7 @@ void intel_dsb_wait(struct intel_dsb *dsb)
* 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(const struct intel_crtc_state *crtc_state,
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 intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
...@@ -473,7 +475,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, ...@@ -473,7 +475,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state,
intel_runtime_pm_put(&i915->runtime_pm, wakeref); intel_runtime_pm_put(&i915->runtime_pm, wakeref);
dsb->id = INTEL_DSB_0; dsb->id = dsb_id;
dsb->crtc = crtc; dsb->crtc = crtc;
dsb->size = size / 4; /* in dwords */ dsb->size = size / 4; /* in dwords */
dsb->free_pos = 0; dsb->free_pos = 0;
...@@ -488,7 +490,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, ...@@ -488,7 +490,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state,
out: out:
drm_info_once(&i915->drm, drm_info_once(&i915->drm,
"[CRTC:%d:%s] DSB %d queue setup failed, will fallback to MMIO for display HW programming\n", "[CRTC:%d:%s] DSB %d queue setup failed, will fallback to MMIO for display HW programming\n",
crtc->base.base.id, crtc->base.name, INTEL_DSB_0); crtc->base.base.id, crtc->base.name, dsb_id);
return NULL; return NULL;
} }
......
...@@ -23,6 +23,7 @@ enum intel_dsb_id { ...@@ -23,6 +23,7 @@ enum intel_dsb_id {
}; };
struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state,
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);
void intel_dsb_cleanup(struct intel_dsb *dsb); void intel_dsb_cleanup(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