Commit 16e0f785 authored by Alex Hung's avatar Alex Hung Committed by Simon Ser
Browse files

drm/amd/display: add 3x4 matrix colorop 



This adds support for a 3x4 color transformation matrix.

With this change the following IGT tests pass:
kms_colorop --run plane-XR30-XR30-ctm_3x4_50_desat
kms_colorop --run plane-XR30-XR30-ctm_3x4_overdrive
kms_colorop --run plane-XR30-XR30-ctm_3x4_oversaturate
kms_colorop --run plane-XR30-XR30-ctm_3x4_bt709_enc
kms_colorop --run plane-XR30-XR30-ctm_3x4_bt709_dec

The color pipeline now consists of the following colorops:
1. 1D curve colorop
2. 3x4 CTM
3. 1D curve colorop
4. 1D LUT
5. 1D curve colorop
6. 1D LUT

Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarMelissa Wen <mwen@igalia.com>
Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Link: https://patch.msgid.link/20251115000237.3561250-40-alex.hung@amd.com
parent 5ed78b44

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c

+52 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,47 @@ __set_dm_plane_colorop_degamma(struct drm_plane_state *plane_state, 
	return __set_colorop_in_tf_1d_curve(dc_plane_state, colorop_state);

}



static int

__set_dm_plane_colorop_3x4_matrix(struct drm_plane_state *plane_state,

				  struct dc_plane_state *dc_plane_state,

				  struct drm_colorop *colorop)

{

	struct drm_colorop *old_colorop;

	struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;

	struct drm_atomic_state *state = plane_state->state;

	const struct drm_device *dev = colorop->dev;

	const struct drm_property_blob *blob;

	struct drm_color_ctm_3x4 *ctm = NULL;

	int i = 0;



	/* 3x4 matrix */

	old_colorop = colorop;

	for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) {

		if (new_colorop_state->colorop == old_colorop &&

		    new_colorop_state->colorop->type == DRM_COLOROP_CTM_3X4) {

			colorop_state = new_colorop_state;

			break;

		}

	}



	if (colorop_state && !colorop_state->bypass && colorop->type == DRM_COLOROP_CTM_3X4) {

		drm_dbg(dev, "3x4 matrix colorop with ID: %d\n", colorop->base.id);

		blob = colorop_state->data;

		if (blob->length == sizeof(struct drm_color_ctm_3x4)) {

			ctm = (struct drm_color_ctm_3x4 *) blob->data;

			__drm_ctm_3x4_to_dc_matrix(ctm, dc_plane_state->gamut_remap_matrix.matrix);

			dc_plane_state->gamut_remap_matrix.enable_remap = true;

			dc_plane_state->input_csc_color_matrix.enable_adjustment = false;

		} else {

			drm_warn(dev, "blob->length (%zu) isn't equal to drm_color_ctm_3x4 (%zu)\n",

				 blob->length, sizeof(struct drm_color_ctm_3x4));

			return -EINVAL;

		}

	}



	return 0;

}



static int

__set_dm_plane_colorop_shaper(struct drm_plane_state *plane_state,

			      struct dc_plane_state *dc_plane_state,
@@ -1581,6 +1622,17 @@ amdgpu_dm_plane_set_colorop_properties(struct drm_plane_state *plane_state, 
	if (ret)

		return ret;



	/* 3x4 matrix */

	colorop = colorop->next;

	if (!colorop) {

		drm_dbg(dev, "no 3x4 matrix colorop found\n");

		return -EINVAL;

	}



	ret = __set_dm_plane_colorop_3x4_matrix(plane_state, dc_plane_state, colorop);

	if (ret)

		return ret;



	/* 1D Curve & LUT - SHAPER TF & LUT */

	colorop = colorop->next;

	if (!colorop) {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c

+15 −0
Original line number Diff line number Diff line
@@ -74,6 +74,21 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr 


	i++;



	/* 3x4 matrix */

	ops[i] = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);

	if (!ops[i]) {

		ret = -ENOMEM;

		goto cleanup;

	}



	ret = drm_plane_colorop_ctm_3x4_init(dev, ops[i], plane);

	if (ret)

		goto cleanup;



	drm_colorop_set_next_property(ops[i-1], ops[i]);



	i++;



	/* 1D curve - SHAPER TF */

	ops[i] = kzalloc(sizeof(*ops[0]), GFP_KERNEL);

	if (!ops[i]) {