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

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.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 42c8065d

drivers/gpu/drm/i915/display/intel_color.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

		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)

		return;

drivers/gpu/drm/i915/display/intel_dsb.c

+7 −4
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ void intel_dsb_wait(struct intel_dsb *dsb) 


/**

 * 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

 * @max_cmds: number of commands we need to fit into command buffer

 *
@@ -444,12 +445,14 @@ void intel_dsb_wait(struct intel_dsb *dsb) 
 * Returns:

 * 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,

				    unsigned int max_cmds)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct drm_i915_private *i915 = to_i915(crtc->base.dev);

	struct drm_i915_private *i915 = to_i915(state->base.dev);

	const struct intel_crtc_state *crtc_state =

		intel_atomic_get_new_crtc_state(state, crtc);

	intel_wakeref_t wakeref;

	struct intel_dsb *dsb;

	unsigned int size;

drivers/gpu/drm/i915/display/intel_dsb.h

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include "i915_reg_defs.h"



struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;

struct intel_dsb;
@@ -22,7 +23,8 @@ enum intel_dsb_id { 
	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,

				    unsigned int max_cmds);

void intel_dsb_finish(struct intel_dsb *dsb);