Switch to using the new method for building colorop pipelines.
Signed-off-by: John Harrison <[email protected]>
CC: Alex Hung <[email protected]>
CC: Harry Wentland <[email protected]>
---
.../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
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 48f5c431eaf9..6b5741d9d98b 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
@@ -86,6 +86,8 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
+
list->type = ops[i]->base.id;
i++;
@@ -102,7 +104,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i-1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
i++;
@@ -119,7 +121,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i-1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
i++;
@@ -137,7 +139,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i-1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
i++;
@@ -156,7 +158,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i-1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
i++;
@@ -174,7 +176,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i-1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
i++;
}
@@ -192,7 +194,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i - 1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
i++;
@@ -210,7 +212,7 @@ amdgpu_dm_build_default_pipeline(struct drm_device *dev,
struct drm_plane *plane
if (ret)
goto cleanup;
- drm_colorop_set_next_property(ops[i-1], ops[i]);
+ drm_colorop_add_to_pipeline(ops[0], ops[i]);
list->name = kasprintf(GFP_KERNEL, "Color Pipeline %d",
ops[0]->base.id);
--
2.43.0
