drm/amd/display: Swap matrix and multiplier

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

Signed-off-by: Alex Hung <alex.hung@amd.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Melissa Wen <mwen@igalia.com>
Signed-off-by: Simon Ser <contact@emersion.fr>
Link: https://patch.msgid.link/20251115000237.3561250-43-alex.hung@amd.com

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 e0788be907a78df67eb7a678f7e3c63ff7dbd16e..868f3500cb857ac02057612ee7973280c6df1bff 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
@@ -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;
 

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 098c98cc64ff5262c02ca88c2d7e4ab495f5192e..33907cc8e1b3e36eafa13ee2e5e1f92c097faf75 100644 (file)
--- 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;