[PATCH v5 39/44] drm/amd/display: Swap matrix and multiplier
Harry Wentland
harry.wentland at amd.com
Mon Aug 19 20:57:06 UTC 2024
From: Alex Hung <alex.hung at amd.com>
Swap the order of matrix and multiplier as designed in hardware.
Signed-off-by: Alex Hung <alex.hung at amd.com>
---
.../amd/display/amdgpu_dm/amdgpu_dm_color.c | 22 +++++++-------
.../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 30 +++++++++----------
2 files changed, 26 insertions(+), 26 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 a14dc67dbbdf..2f0b06fb5f81 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 b739d6cb3e6b..8a86849e1529 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
@@ -69,21 +69,6 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
prev_op = op;
- /* 3x4 matrix */
- op = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);
- if (!op) {
- DRM_ERROR("KMS: Failed to allocate colorop\n");
- return -ENOMEM;
- }
-
- ret = drm_colorop_ctm_3x4_init(dev, op, plane);
- if (ret)
- return ret;
-
- drm_colorop_set_next_property(prev_op, op);
-
- prev_op = op;
-
/* Multiplier */
op = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);
if (!op) {
@@ -99,6 +84,21 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr
prev_op = op;
+ /* 3x4 matrix */
+ op = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);
+ if (!op) {
+ DRM_ERROR("KMS: Failed to allocate colorop\n");
+ return -ENOMEM;
+ }
+
+ ret = drm_colorop_ctm_3x4_init(dev, op, plane);
+ if (ret)
+ return ret;
+
+ drm_colorop_set_next_property(prev_op, op);
+
+ prev_op = op;
+
/* 1D curve - SHAPER TF */
op = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);
if (!op) {
--
2.46.0
More information about the amd-gfx
mailing list