[PATCH V10 39/46] drm/amd/display: Swap matrix and multiplier
Alex Hung
alex.hung at amd.com
Tue Jun 17 04:17:21 UTC 2025
Swap the order of matrix and multiplier as designed in hardware.
Signed-off-by: Alex Hung <alex.hung at amd.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Melissa Wen <mwen at igalia.com>
---
V9:
- Update function names by _plane_ (Chaitanya Kumar Borah)
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 12 ++++++------
.../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
index f110b5ae3a77..47414f9c5757 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -1617,25 +1617,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;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
index c31c201e0a83..f89f6631062e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c
@@ -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;
--
2.43.0
More information about the amd-gfx
mailing list