[PATCH v8 2/3] drm/plane: modify create_in_formats to accommodate async

[Arun R Murthy]

create_in_formats creates the list of supported format/modifiers for
synchronous flips, modify the same function so as to take the
format_mod_supported as argument and create list of format/modifier for
async as well.

v5: create_in_formats can return -ve value in failure case, correct the
if condition to check the creation of blob <Chaitanya>
Dont add the modifier for which none of the formats is not supported.
v6: Remove the code for masking the unsupported modifiers as UMD can
leave with it. (Naveen/Chaitanya)
v7: Retain the unsupported modifiers, userspace should have no
impact, return pointer to blob instead of blob_id(Ville)

Signed-off-by: Arun R Murthy <arun.r.mur...@intel.com>
Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.bo...@intel.com>
Tested-by: Naveen Kumar <naveen1.ku...@intel.com>
---
 drivers/gpu/drm/drm_plane.c | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 
110838c3e5920835e0875e57e6e479bcab7c8733..fd7c30622909075cf015d4e5167801d49b8c73b4
 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -193,9 +193,13 @@ 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)
+static struct drm_property_blob *create_in_format_blob(struct drm_device *dev,
+                                                      struct drm_plane *plane,
+                                                      bool 
(*format_mod_supported)
+                                                      (struct drm_plane *plane,
+                                                       u32 format,
+                                                       u64 modifier))
 {
-       const struct drm_mode_config *config = &dev->mode_config;
        struct drm_property_blob *blob;
        struct drm_format_modifier *mod;
        size_t blob_size, formats_size, modifiers_size;
@@ -237,10 +241,10 @@ static int create_in_format_blob(struct drm_device *dev, 
struct drm_plane *plane
        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 ||
-                           plane->funcs->format_mod_supported(plane,
-                                                              
plane->format_types[j],
-                                                              
plane->modifiers[i])) {
+                       if (!format_mod_supported ||
+                           format_mod_supported(plane,
+                                                plane->format_types[j],
+                                                plane->modifiers[i])) {
                                mod->formats |= 1ULL << j;
                        }
                }
@@ -251,10 +255,7 @@ static int create_in_format_blob(struct drm_device *dev, 
struct drm_plane *plane
                mod++;
        }
 
-       drm_object_attach_property(&plane->base, config->modifiers_property,
-                                  blob->base.id);
-
-       return 0;
+       return blob;
 }
 
 /**
@@ -366,6 +367,7 @@ static int __drm_universal_plane_init(struct drm_device 
*dev,
                                      const char *name, va_list ap)
 {
        struct drm_mode_config *config = &dev->mode_config;
+       struct drm_property_blob *blob;
        static const uint64_t default_modifiers[] = {
                DRM_FORMAT_MOD_LINEAR,
        };
@@ -477,8 +479,24 @@ static int __drm_universal_plane_init(struct drm_device 
*dev,
                drm_plane_create_hotspot_properties(plane);
        }
 
-       if (format_modifier_count)
-               create_in_format_blob(dev, plane);
+       if (format_modifier_count) {
+               blob = create_in_format_blob(dev, plane,
+                                            
plane->funcs->format_mod_supported);
+               if (!IS_ERR(blob))
+                       drm_object_attach_property(&plane->base,
+                                                  config->modifiers_property,
+                                                  blob->base.id);
+       }
+
+       if (plane->funcs->format_mod_supported_async) {
+               blob = create_in_format_blob(dev, plane,
+                                            
plane->funcs->format_mod_supported_async);
+               if (!IS_ERR(blob))
+                       drm_object_attach_property(&plane->base,
+                                                  
config->async_modifiers_property,
+                                                  blob->base.id);
+       }
+
 
        return 0;
 }

-- 
2.25.1