drm/amd/display: Ignore deprecated props when plane_color_pipeline set

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

Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Melissa Wen <mwen@igalia.com>
Signed-off-by: Simon Ser <contact@emersion.fr>
Link: https://patch.msgid.link/20251115000237.3561250-26-alex.hung@amd.com

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 bb0fe91a160101aac62318617711cbb7083cce1a..6e5c3e7afb091b72ad1c29a289bc23d6d2df1118 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5880,6 +5880,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;