[PATCH v6 24/44] drm/amd/display: Ignore deprecated props when plane_color_pipeline set

[Harry Wentland]

When the plane_color_pipeline bit is set we should ignore
deprecated properties, such as COLOR_RANGE and COLOR_ENCODING.

Signed-off-by: Harry Wentland <harry.wentl...@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 6e79028c5d78..575eacfc12e6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5420,6 +5420,10 @@ fill_plane_color_attributes(const struct drm_plane_state 
*plane_state,
 
        *color_space = COLOR_SPACE_SRGB;
 
+       /* Ignore properties when DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE is set */
+       if (plane_state->state && plane_state->state->plane_color_pipeline)
+               return 0;
+
        /* DRM color properties only affect non-RGB formats. */
        if (format < SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)
                return 0;
-- 
2.46.2