drm/atomic: track individual colorop updates

As we do for CRTC color mgmt properties, use color_mgmt_changed flag to
track any value changes in the color pipeline of a given plane, so that
drivers can update color blocks as soon as plane color pipeline or
individual colorop values change. Since we're here, only announce and
track changes to plane COLOR_PIPELINE prop if its value is actually
changing.

Fixes: 8c5ea1745f4c ("drm/colorop: Add BYPASS property")
Fixes: 7fa3ee8c0a79 ("drm/colorop: Define LUT_1D interpolation")
Fixes: 41651f9d42eb ("drm/colorop: Add 1D Curve subtype")
Fixes: 3410108037d5 ("drm/colorop: Add multiplier type")
Fixes: db971856bbe0 ("drm/colorop: Add 3D LUT support to color pipeline")
Fixes: e5719e7f1900 ("drm/colorop: Add 3x4 CTM type")
Fixes: 99a4e4f08abe ("drm/colorop: Add 1D Curve Custom LUT type")
Fixes: 2afc3184f3b3 ("drm/plane: Add COLOR PIPELINE property")
Reviewed-by: Harry Wentland <harry.wentland@amd.com> #v1
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
Fixes: 9ba25915efba ("drm/amd/display: Add support for sRGB EOTF in DEGAM block")
Signed-off-by: Melissa Wen <mwen@igalia.com>
Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Link: https://patch.msgid.link/20260609110420.1298352-4-mwen@igalia.com

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index b81dbba4d8c30c22373d85f52d46f067876375bc..5eaf0e8a494b721def1fcdebc2e84b20f8e1ef52 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -265,13 +265,19 @@ EXPORT_SYMBOL(drm_atomic_set_fb_for_plane);
  *
  * Helper function to select the color pipeline on a plane by setting
  * it to the first drm_colorop element of the pipeline.
+ *
+ * Return: true if plane color pipeline value changed, false otherwise.
  */
-void
+bool
 drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,
                                 struct drm_colorop *colorop)
 {
        struct drm_plane *plane = plane_state->plane;
 
+       /* Color pipeline didn't change */
+       if (plane_state->color_pipeline == colorop)
+               return false;
+
        if (colorop)
                drm_dbg_atomic(plane->dev,
                               "Set [COLOROP:%d] for [PLANE:%d:%s] state %p\n",
@@ -283,6 +289,8 @@ drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,
                               plane->base.id, plane->name, plane_state);
 
        plane_state->color_pipeline = colorop;
+
+       return true;
 }
 EXPORT_SYMBOL(drm_atomic_set_colorop_for_plane);
 
@@ -604,7 +612,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,
                if (val && !colorop)
                        return -EACCES;
 
-               drm_atomic_set_colorop_for_plane(state, colorop);
+               state->color_mgmt_changed |= drm_atomic_set_colorop_for_plane(state, colorop);
        } else if (property == config->prop_fb_damage_clips) {
                ret = drm_property_replace_blob_from_id(dev,
                                        &state->fb_damage_clips,
@@ -713,11 +721,11 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
 static int drm_atomic_color_set_data_property(struct drm_colorop *colorop,
                                              struct drm_colorop_state *state,
                                              struct drm_property *property,
-                                             uint64_t val)
+                                             uint64_t val,
+                                             bool *replaced)
 {
        ssize_t elem_size = -1;
        ssize_t size = -1;
-       bool replaced = false;
 
        switch (colorop->type) {
        case DRM_COLOROP_1D_LUT:
@@ -739,28 +747,45 @@ static int drm_atomic_color_set_data_property(struct drm_colorop *colorop,
                                                 &state->data,
                                                 val,
                                                 -1, size, elem_size,
-                                                &replaced);
+                                                replaced);
 }
 
 static int drm_atomic_colorop_set_property(struct drm_colorop *colorop,
                                           struct drm_colorop_state *state,
                                           struct drm_file *file_priv,
                                           struct drm_property *property,
-                                          uint64_t val)
+                                          uint64_t val,
+                                          bool *replaced)
 {
        if (property == colorop->bypass_property) {
-               state->bypass = val;
+               if (state->bypass != val) {
+                       state->bypass = val;
+                       *replaced = true;
+               }
        } else if (property == colorop->lut1d_interpolation_property) {
-               state->lut1d_interpolation = val;
+               if (state->lut1d_interpolation != val) {
+                       state->lut1d_interpolation = val;
+                       *replaced = true;
+               }
        } else if (property == colorop->curve_1d_type_property) {
-               state->curve_1d_type = val;
+               if (state->curve_1d_type != val) {
+                       state->curve_1d_type = val;
+                       *replaced = true;
+               }
        } else if (property == colorop->multiplier_property) {
-               state->multiplier = val;
+               if (state->multiplier != val) {
+                       state->multiplier = val;
+                       *replaced = true;
+               }
        } else if (property == colorop->lut3d_interpolation_property) {
-               state->lut3d_interpolation = val;
+               if (state->lut3d_interpolation != val) {
+                       state->lut3d_interpolation = val;
+                       *replaced = true;
+               }
        } else if (property == colorop->data_property) {
                return drm_atomic_color_set_data_property(colorop, state,
-                                                         property, val);
+                                                         property, val,
+                                                         replaced);
        } else {
                drm_dbg_atomic(colorop->dev,
                               "[COLOROP:%d:%d] unknown property [PROP:%d:%s]\n",
@@ -1275,8 +1300,10 @@ int drm_atomic_set_property(struct drm_atomic_state *state,
                break;
        }
        case DRM_MODE_OBJECT_COLOROP: {
+               struct drm_plane_state *plane_state;
                struct drm_colorop *colorop = obj_to_colorop(obj);
                struct drm_colorop_state *colorop_state;
+               bool replaced = false;
 
                colorop_state = drm_atomic_get_colorop_state(state, colorop);
                if (IS_ERR(colorop_state)) {
@@ -1285,7 +1312,18 @@ int drm_atomic_set_property(struct drm_atomic_state *state,
                }
 
                ret = drm_atomic_colorop_set_property(colorop, colorop_state,
-                                                     file_priv, prop, prop_value);
+                                                     file_priv, prop, prop_value,
+                                                     &replaced);
+               if (ret || !replaced)
+                       break;
+
+               plane_state = drm_atomic_get_plane_state(state, colorop->plane);
+               if (IS_ERR(plane_state)) {
+                       ret = PTR_ERR(plane_state);
+                       break;
+               }
+               plane_state->color_mgmt_changed |= replaced;
+
                break;
        }
        default:

diff --git a/include/drm/drm_atomic_uapi.h b/include/drm/drm_atomic_uapi.h
index 4363155233267b93767c895fa6085544e2277442..4e7e78f711e26a5d2d378b97bf98f9838fc837f2 100644 (file)
--- a/include/drm/drm_atomic_uapi.h
+++ b/include/drm/drm_atomic_uapi.h
@@ -29,6 +29,8 @@
 #ifndef DRM_ATOMIC_UAPI_H_
 #define DRM_ATOMIC_UAPI_H_
 
+#include <linux/types.h>
+
 struct drm_crtc_state;
 struct drm_display_mode;
 struct drm_property_blob;
@@ -50,7 +52,7 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state,
                              struct drm_crtc *crtc);
 void drm_atomic_set_fb_for_plane(struct drm_plane_state *plane_state,
                                 struct drm_framebuffer *fb);
-void drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,
+bool drm_atomic_set_colorop_for_plane(struct drm_plane_state *plane_state,
                                      struct drm_colorop *colorop);
 int __must_check
 drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,