When drm_atomic_add_affected_planes() adds a plane to the atomic
state, the associated colorops are not guaranteed to be included.
This can leave colorop state out of the transaction when planes
are pulled in implicitly (eg. during modeset or internal commits).
Also add affected colorops when adding affected planes to keep
plane and color pipeline state consistent within the atomic
transaction.
Fixes: 2afc3184f3b3 ("drm/plane: Add COLOR PIPELINE property")
Cc: <[email protected]> #v6.19+
Signed-off-by: Chaitanya Kumar Borah <[email protected]>
---
drivers/gpu/drm/drm_atomic.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index e3029c8f02e5..8bcd76aaeb6a 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1588,6 +1588,7 @@ drm_atomic_add_affected_planes(struct drm_atomic_state
*state,
const struct drm_crtc_state *old_crtc_state =
drm_atomic_get_old_crtc_state(state, crtc);
struct drm_plane *plane;
+ int ret;
WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));
@@ -1601,6 +1602,10 @@ drm_atomic_add_affected_planes(struct drm_atomic_state
*state,
if (IS_ERR(plane_state))
return PTR_ERR(plane_state);
+
+ ret = drm_atomic_add_affected_colorops(state, plane);
+ if (ret)
+ return ret;
}
return 0;
}
--
2.25.1
