[RFC PATCH 19/19] drm/amd/display: enable post-blend colorop properties

[Melissa Wen]

Signed-off-by: Melissa Wen <m...@igalia.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 5 +++++
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c  | 4 ++++
 2 files changed, 9 insertions(+)

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 9e5da58f26f8..cb4e3e5652bd 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
@@ -1389,6 +1389,11 @@ int amdgpu_dm_check_crtc_color_mgmt(struct dm_crtc_state 
*crtc,
        bool is_legacy;
        int r;
 
+       if (crtc->base.color_pipeline_enabled) {
+               r = amdgpu_dm_crtc_set_colorop_properties(&crtc->base, stream, 
check_only);
+               return r;
+       }
+
        tf = amdgpu_tf_to_dc_tf(crtc->regamma_tf);
 
        r = amdgpu_dm_verify_lut_sizes(&crtc->base);
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
index 6226c9ba5fce..33b3e66f6941 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
@@ -804,6 +804,10 @@ int amdgpu_dm_crtc_init(struct amdgpu_display_manager *dm,
 
 #ifdef AMD_PRIVATE_COLOR
        dm_crtc_additional_color_mgmt(&acrtc->base);
+#else
+       res = dm_crtc_init_colorops(&acrtc->base);
+       if (res)
+               return res;
 #endif
        return 0;
 
-- 
2.53.0