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

drm/i915: Add a .color_post_update() hook 



We're going to need stuff after the color management
register latching has happened. Add a corresponding hook.

Cc: <stable@vger.kernel.org> #v5.19+
Cc: Manasi Navare <navaremanasi@google.com>
Cc: Drew Davenport <ddavenport@chromium.org>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230320095438.17328-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent 80a892a4

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

+13 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ struct intel_color_funcs { 
	 * registers involved with the same commit.

	 */

	void (*color_commit_arm)(const struct intel_crtc_state *crtc_state);

	/*

	 * Perform any extra tasks needed after all the

	 * double buffered registers have been latched.

	 */

	void (*color_post_update)(const struct intel_crtc_state *crtc_state);

	/*

	 * Load LUTs (and other single buffered color management

	 * registers). Will (hopefully) be called during the vblank
@@ -1414,6 +1419,14 @@ void intel_color_commit_arm(const struct intel_crtc_state *crtc_state) 
	i915->display.funcs.color->color_commit_arm(crtc_state);

}



void intel_color_post_update(const struct intel_crtc_state *crtc_state)

{

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



	if (i915->display.funcs.color->color_post_update)

		i915->display.funcs.color->color_post_update(crtc_state);

}



void intel_color_prepare_commit(struct intel_crtc_state *crtc_state)

{

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

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

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ void intel_color_prepare_commit(struct intel_crtc_state *crtc_state); 
void intel_color_cleanup_commit(struct intel_crtc_state *crtc_state);

void intel_color_commit_noarm(const struct intel_crtc_state *crtc_state);

void intel_color_commit_arm(const struct intel_crtc_state *crtc_state);

void intel_color_post_update(const struct intel_crtc_state *crtc_state);

void intel_color_load_luts(const struct intel_crtc_state *crtc_state);

void intel_color_get_config(struct intel_crtc_state *crtc_state);

bool intel_color_lut_equal(const struct intel_crtc_state *crtc_state,

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

+3 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,9 @@ static void intel_post_plane_update(struct intel_atomic_state *state, 
	if (needs_cursorclk_wa(old_crtc_state) &&

	    !needs_cursorclk_wa(new_crtc_state))

		icl_wa_cursorclkgating(dev_priv, pipe, false);



	if (intel_crtc_needs_color_update(new_crtc_state))

		intel_color_post_update(new_crtc_state);

}



static void intel_crtc_enable_flip_done(struct intel_atomic_state *state,