6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: André Almeida <andrealmeid@xxxxxxxxxx> [ Upstream commit f85de245c6a8e2654e1e9158588bcf78e38cd5a5 ] Allow userspace to use damage clips with atomic async flips. Damage clips are useful for partial plane updates, which can be helpful for clients that want to do flips asynchronously. Fixes: 0e26cc72c71c ("drm: Refuse to async flip with atomic prop changes") Signed-off-by: André Almeida <andrealmeid@xxxxxxxxxx> Reviewed-by: Simon Ser <contact@xxxxxxxxxxx> Signed-off-by: Simon Ser <contact@xxxxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/20240702212215.109696-2-andrealmeid@xxxxxxxxxx Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- drivers/gpu/drm/drm_atomic_uapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index fef4849a4ec21..02b1235c6d619 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1068,7 +1068,8 @@ int drm_atomic_set_property(struct drm_atomic_state *state, if (async_flip && prop != config->prop_fb_id && - prop != config->prop_in_fence_fd) { + prop != config->prop_in_fence_fd && + prop != config->prop_fb_damage_clips) { ret = drm_atomic_plane_get_property(plane, plane_state, prop, &old_val); ret = drm_atomic_check_prop_changes(ret, old_val, prop_value, prop); -- 2.43.0