[PATCHv2 2/3] drm/plane: Expose function to create format/modifier blob

[Arun R Murthy]

Expose drm plane function to create formats/modifiers blob. This
function can be used to expose list of supported formats/modifiers for
sync/async flips.

Signed-off-by: Arun R Murthy <arun.r.mur...@intel.com>
---
 drivers/gpu/drm/drm_plane.c | 44 ++++++++++++++++++++++++-------------
 include/drm/drm_plane.h     |  4 ++++
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 416818e54ccf..4f35eec2b777 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -191,7 +191,10 @@ modifiers_ptr(struct drm_format_modifier_blob *blob)
        return (struct drm_format_modifier *)(((char *)blob) + 
blob->modifiers_offset);
 }
 
-static int create_in_format_blob(struct drm_device *dev, struct drm_plane 
*plane)
+int drm_plane_create_format_blob(struct drm_device *dev,
+                                struct drm_plane *plane, u64 *modifiers,
+                                unsigned int modifier_count, u32 *formats,
+                                unsigned int format_count, bool is_async)
 {
        const struct drm_mode_config *config = &dev->mode_config;
        struct drm_property_blob *blob;
@@ -200,14 +203,14 @@ static int create_in_format_blob(struct drm_device *dev, 
struct drm_plane *plane
        struct drm_format_modifier_blob *blob_data;
        unsigned int i, j;
 
-       formats_size = sizeof(__u32) * plane->format_count;
+       formats_size = sizeof(__u32) * format_count;
        if (WARN_ON(!formats_size)) {
                /* 0 formats are never expected */
                return 0;
        }
 
        modifiers_size =
-               sizeof(struct drm_format_modifier) * plane->modifier_count;
+               sizeof(struct drm_format_modifier) * modifier_count;
 
        blob_size = sizeof(struct drm_format_modifier_blob);
        /* Modifiers offset is a pointer to a struct with a 64 bit field so it
@@ -223,37 +226,45 @@ static int create_in_format_blob(struct drm_device *dev, 
struct drm_plane *plane
 
        blob_data = blob->data;
        blob_data->version = FORMAT_BLOB_CURRENT;
-       blob_data->count_formats = plane->format_count;
+       blob_data->count_formats = format_count;
        blob_data->formats_offset = sizeof(struct drm_format_modifier_blob);
-       blob_data->count_modifiers = plane->modifier_count;
+       blob_data->count_modifiers = modifier_count;
 
        blob_data->modifiers_offset =
                ALIGN(blob_data->formats_offset + formats_size, 8);
 
-       memcpy(formats_ptr(blob_data), plane->format_types, formats_size);
+       memcpy(formats_ptr(blob_data), formats, formats_size);
 
        mod = modifiers_ptr(blob_data);
-       for (i = 0; i < plane->modifier_count; i++) {
-               for (j = 0; j < plane->format_count; j++) {
-                       if (!plane->funcs->format_mod_supported ||
+       for (i = 0; i < modifier_count; i++) {
+               for (j = 0; j < format_count; j++) {
+                       if (is_async ||
+                           !plane->funcs->format_mod_supported ||
                            plane->funcs->format_mod_supported(plane,
-                                                              
plane->format_types[j],
-                                                              
plane->modifiers[i])) {
+                                                              formats[j],
+                                                              modifiers[i])) {
                                mod->formats |= 1ULL << j;
                        }
                }
 
-               mod->modifier = plane->modifiers[i];
+               mod->modifier = modifiers[i];
                mod->offset = 0;
                mod->pad = 0;
                mod++;
        }
 
-       drm_object_attach_property(&plane->base, config->modifiers_property,
-                                  blob->base.id);
+       if (is_async)
+               drm_object_attach_property(&plane->base,
+                                          config->async_modifiers_property,
+                                          blob->base.id);
+       else
+               drm_object_attach_property(&plane->base,
+                                          config->modifiers_property,
+                                          blob->base.id);
 
        return 0;
 }
+EXPORT_SYMBOL(drm_plane_create_format_blob);
 
 /**
  * DOC: hotspot properties
@@ -476,7 +487,10 @@ static int __drm_universal_plane_init(struct drm_device 
*dev,
        }
 
        if (format_modifier_count)
-               create_in_format_blob(dev, plane);
+               drm_plane_create_format_blob(dev, plane, plane->modifiers,
+                                            format_modifier_count,
+                                            plane->format_types, format_count,
+                                            false);
 
        return 0;
 }
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index dd718c62ac31..3c5c2c614af8 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -988,5 +988,9 @@ int drm_plane_create_scaling_filter_property(struct 
drm_plane *plane,
 int drm_plane_add_size_hints_property(struct drm_plane *plane,
                                      const struct drm_plane_size_hint *hints,
                                      int num_hints);
+int drm_plane_create_format_blob(struct drm_device *dev,
+                                struct drm_plane *plane, u64 *modifiers,
+                                unsigned int modifier_count, u32 *formats,
+                                unsigned int format_count, bool is_async);
 
 #endif
-- 
2.25.1