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)
Signed-off-by: Arun R Murthy <arun.r.mur...@intel.com>
Tested-by: Naveen Kumar <naveen1.ku...@intel.com>
---
drivers/gpu/drm/drm_plane.c | 41 +++++++++++++++++++++++++++++------------
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index
fe181c1002171acc68d3054c2d178f9b9f501fe2..a27ea45f3c12f5c3ff9532e9c0e3ae0897a02501
100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -193,9 +193,12 @@ 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 int create_in_format_blob(struct drm_device *dev, struct drm_plane
*plane,
+ bool (*format_mod_supported)
+ (struct drm_plane *plane,
+ uint32_t format,
+ uint64_t 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 +240,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 +254,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->base.id;
}
/**
@@ -371,6 +371,7 @@ static int __drm_universal_plane_init(struct drm_device
*dev,
};
unsigned int format_modifier_count = 0;
int ret;
+ int blob_id;
/* plane index is used with 32bit bitmasks */
if (WARN_ON(config->num_total_plane >= 32))
@@ -477,8 +478,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_id = create_in_format_blob(dev, plane,
+
plane->funcs->format_mod_supported);
+ if (blob_id > 0)
+ drm_object_attach_property(&plane->base,
+ config->modifiers_property,
+ blob_id);
+ }
+
+ if (plane->funcs->format_mod_supported_async) {
+ blob_id = create_in_format_blob(dev, plane,
+
plane->funcs->format_mod_supported_async);
+ if (blob_id > 0)
+ drm_object_attach_property(&plane->base,
+
config->async_modifiers_property,
+ blob_id);
+ }
+
return 0;
}
--
2.25.1
