[PATCH v6 39/44] drm/amd/display: Swap matrix and multiplier

[Harry Wentland]

From: Alex Hung <alex.h...@amd.com>

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

Signed-off-by: Alex Hung <alex.h...@amd.com>
---
 .../amd/display/amdgpu_dm/amdgpu_dm_color.c   | 22 ++++++-------
 .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 32 +++++++++----------
 2 files changed, 27 insertions(+), 27 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 cd545adbb13a..e41329cffd9e 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
@@ -1479,17 +1479,6 @@ 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;
-
        /* Multiplier */
        colorop = colorop->next;
        if (!colorop) {
@@ -1501,6 +1490,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) {
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 a431de9d2b8f..df82fb14f8ca 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
@@ -75,22 +75,6 @@ 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]) {
-               DRM_ERROR("KMS: Failed to allocate colorop\n");
-               ret = -ENOMEM;
-               goto cleanup;
-       }
-
-       ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane);
-       if (ret)
-               goto cleanup;
-
-       drm_colorop_set_next_property(ops[i-1], ops[i]);
-
-       i++;
-
        /* Multiplier */
        ops[i] = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);
        if (!ops[i]) {
@@ -107,6 +91,22 @@ 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]) {
+               DRM_ERROR("KMS: Failed to allocate colorop\n");
+               ret = -ENOMEM;
+               goto cleanup;
+       }
+
+       ret = drm_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(struct drm_colorop), GFP_KERNEL);
        if (!ops[i]) {
-- 
2.46.2