Only consider affected colorop states those that are part of an active
color pipeline or a pipeline that is about to be activated or
deactivated in the same atomic commit, i.e., colorop is in the chain of
old/new plane color pipeline property. To cover color_pipeline
deactivation, remove the condition for plane_state->color_pipeline.

Signed-off-by: Melissa Wen <[email protected]>
---
 drivers/gpu/drm/drm_atomic.c | 59 +++++++++++++++++++++++++++++++++---
 include/drm/drm_colorop.h    |  3 ++
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 81591173265d..2e82c06166be 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -935,6 +935,57 @@ static int drm_atomic_plane_check(const struct 
drm_plane_state *old_plane_state,
        return 0;
 }
 
+/*
+ * This function walks old and new plane state color pipelines and adds all
+ * colorops in use by @plane to the atomic configuration @state. This is useful
+ * when an atomic commit needs to check all currently enabled or about to be
+ * enabled colorop on @plane, e.g. when changing the mode. This also avoids
+ * including colorop states that are not part of the atomic state.
+ *
+ * Returns:
+ * 0 on success or can fail with -EDEADLK or -ENOMEM. When the error is EDEADLK
+ * then the w/w mutex code has detected a deadlock and the entire atomic
+ * sequence must be restarted. All other errors are fatal.
+ */
+static int
+drm_atomic_add_pipeline_colorops(struct drm_atomic_commit *state,
+                                struct drm_plane *plane)
+{
+       struct drm_colorop *colorop;
+       struct drm_colorop_state *colorop_state;
+       struct drm_plane_state *new_plane_state, *old_plane_state;
+
+       new_plane_state = drm_atomic_get_new_plane_state(state, plane);
+       old_plane_state = drm_atomic_get_old_plane_state(state, plane);
+
+       if (WARN_ON(!new_plane_state || !old_plane_state))
+               return -EINVAL;
+
+       drm_dbg_atomic(plane->dev,
+                      "Adding old+new pipeline colorops for [PLANE:%d:%s]\n",
+                      plane->base.id, plane->name);
+
+       drm_for_each_colorop_in_pipeline(colorop,
+                                        new_plane_state->color_pipeline) {
+               colorop_state = drm_atomic_get_colorop_state(state, colorop);
+               if (IS_ERR(colorop_state))
+                       return PTR_ERR(colorop_state);
+       }
+
+       /* Same color pipeline as new; no point walking old. */
+       if (new_plane_state->color_pipeline == old_plane_state->color_pipeline)
+               return 0;
+
+       drm_for_each_colorop_in_pipeline(colorop,
+                                        old_plane_state->color_pipeline) {
+               colorop_state = drm_atomic_get_colorop_state(state, colorop);
+               if (IS_ERR(colorop_state))
+                       return PTR_ERR(colorop_state);
+       }
+
+       return 0;
+}
+
 static void drm_atomic_colorop_print_state(struct drm_printer *p,
                                           const struct drm_colorop_state 
*state)
 {
@@ -1746,11 +1797,9 @@ drm_atomic_add_affected_planes(struct drm_atomic_commit 
*state,
                if (IS_ERR(plane_state))
                        return PTR_ERR(plane_state);
 
-               if (plane_state->color_pipeline) {
-                       ret = drm_atomic_add_affected_colorops(state, plane);
-                       if (ret)
-                               return ret;
-               }
+               ret = drm_atomic_add_pipeline_colorops(state, plane);
+               if (ret)
+                       return ret;
        }
        return 0;
 }
diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
index 26ef67c835e2..11a88e9477f1 100644
--- a/include/drm/drm_colorop.h
+++ b/include/drm/drm_colorop.h
@@ -583,6 +583,9 @@ static inline unsigned int drm_colorop_index(const struct 
drm_colorop *colorop)
 #define drm_for_each_colorop(colorop, dev) \
        list_for_each_entry(colorop, &(dev)->mode_config.colorop_list, head)
 
+#define drm_for_each_colorop_in_pipeline(colorop, pipeline) \
+       for ((colorop) = (pipeline); (colorop); (colorop) = (colorop)->next)
+
 /**
  * drm_get_colorop_type_name - return a string for colorop type
  * @type: colorop type to compute name of
-- 
2.53.0

Reply via email to