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

drm/i915: Split icl_color_commit_noarm() from skl_color_commit_noarm() 



We're going to want different behavior for skl/glk vs. icl
in .color_commit_noarm(), so split the hook into two. Arguably
we already had slightly different behaviour since
csc_enable/gamma_enable are never set on icl+, so the old
code was perhaps a bit confusing as well.

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-2-ville.syrjala@linux.intel.com


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

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

+20 −1
Original line number Diff line number Diff line
@@ -677,6 +677,25 @@ static void skl_color_commit_arm(const struct intel_crtc_state *crtc_state) 
			  crtc_state->csc_mode);

}



static void icl_color_commit_arm(const struct intel_crtc_state *crtc_state)

{

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

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

	enum pipe pipe = crtc->pipe;



	/*

	 * We don't (yet) allow userspace to control the pipe background color,

	 * so force it to black.

	 */

	intel_de_write(i915, SKL_BOTTOM_COLOR(pipe), 0);



	intel_de_write(i915, GAMMA_MODE(crtc->pipe),

		       crtc_state->gamma_mode);



	intel_de_write_fw(i915, PIPE_CSC_MODE(crtc->pipe),

			  crtc_state->csc_mode);

}



static struct drm_property_blob *

create_linear_lut(struct drm_i915_private *i915, int lut_size)

{
@@ -3075,7 +3094,7 @@ static const struct intel_color_funcs i9xx_color_funcs = { 
static const struct intel_color_funcs icl_color_funcs = {

	.color_check = icl_color_check,

	.color_commit_noarm = icl_color_commit_noarm,

	.color_commit_arm = skl_color_commit_arm,

	.color_commit_arm = icl_color_commit_arm,

	.load_luts = icl_load_luts,

	.read_luts = icl_read_luts,

	.lut_equal = icl_lut_equal,