Different planes may have different capabilities of doing async flips,
so create a field to let drivers allow async flip per plane type.

Signed-off-by: André Almeida <andrealm...@igalia.com>
---
v4: new patch

 drivers/gpu/drm/drm_atomic_uapi.c | 4 ++--
 drivers/gpu/drm/drm_plane.c       | 3 +++
 include/drm/drm_plane.h           | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c 
b/drivers/gpu/drm/drm_atomic_uapi.c
index 1eecfb9e240d..5c66289188be 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -1075,9 +1075,9 @@ int drm_atomic_set_property(struct drm_atomic_state 
*state,
                        break;
                }
 
-               if (async_flip && plane_state->plane->type != 
DRM_PLANE_TYPE_PRIMARY) {
+               if (async_flip && !plane_state->plane->async_flip) {
                        drm_dbg_atomic(prop->dev,
-                                      "[OBJECT:%d] Only primary planes can be 
changed during async flip\n",
+                                      "[OBJECT:%d] This type of plane cannot 
be changed during async flip\n",
                                       obj->id);
                        ret = -EINVAL;
                        break;
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 672c655c7a8e..71ada690222a 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -366,6 +366,9 @@ static int __drm_universal_plane_init(struct drm_device 
*dev,
 
        drm_modeset_lock_init(&plane->mutex);
 
+       if (type == DRM_PLANE_TYPE_PRIMARY)
+               plane->async_flip = true;
+
        plane->base.properties = &plane->properties;
        plane->dev = dev;
        plane->funcs = funcs;
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 641fe298052d..5e9efb7321ac 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -779,6 +779,11 @@ struct drm_plane {
         * @hotspot_y_property: property to set mouse hotspot y offset.
         */
        struct drm_property *hotspot_y_property;
+
+       /**
+        * @async_flip: indicates if a plane can do async flips
+        */
+       bool async_flip;
 };
 
 #define obj_to_plane(x) container_of(x, struct drm_plane, base)
-- 
2.43.0

Reply via email to