Commit 68186c73 authored by Alex Hung's avatar Alex Hung Committed by Simon Ser
Browse files

drm/amd/display: Swap matrix and multiplier 



Swap the order of matrix and multiplier as designed in hardware.

Signed-off-by: default avatarAlex Hung <alex.hung@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-43-alex.hung@amd.com
parent de0b0eb2

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

+6 −6
Original line number Diff line number Diff line
@@ -1651,25 +1651,25 @@ amdgpu_dm_plane_set_colorop_properties(struct drm_plane_state *plane_state, 
	if (ret)

		return ret;



	/* 3x4 matrix */

	/* Multiplier */

	colorop = colorop->next;

	if (!colorop) {

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

		drm_dbg(dev, "no multiplier colorop found\n");

		return -EINVAL;

	}



	ret = __set_dm_plane_colorop_3x4_matrix(plane_state, dc_plane_state, colorop);

	ret = __set_dm_plane_colorop_multiplier(plane_state, dc_plane_state, colorop);

	if (ret)

		return ret;



	/* Multiplier */

	/* 3x4 matrix */

	colorop = colorop->next;

	if (!colorop) {

		drm_dbg(dev, "no multiplier colorop found\n");

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

		return -EINVAL;

	}



	ret = __set_dm_plane_colorop_multiplier(plane_state, dc_plane_state, colorop);

	ret = __set_dm_plane_colorop_3x4_matrix(plane_state, dc_plane_state, colorop);

	if (ret)

		return ret;

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

+4 −4
Original line number Diff line number Diff line
@@ -74,14 +74,14 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr 


	i++;



	/* 3x4 matrix */

	/* Multiplier */

	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);

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

	if (ret)

		goto cleanup;
@@ -89,14 +89,14 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr 


	i++;



	/* Multiplier */

	/* 3x4 matrix */

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

	if (!ops[i]) {

		ret = -ENOMEM;

		goto cleanup;

	}



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

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

	if (ret)

		goto cleanup;