There exists a property IN_FORMATS which exposes the plane supported
modifiers/formats to the user. In some platforms when asynchronous flips
are used all of modifiers/formats mentioned in IN_FORMATS are not
supported. This patch adds a new plane property IN_FORMATS_ASYNC to
expose the async flips supported modifiers/formats so that user can use
this information ahead and done flips with unsupported
formats/modifiers. This will save flips failures.
Signed-off-by: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
---
drivers/gpu/drm/drm_mode_config.c | 7 +++
drivers/gpu/drm/drm_plane.c | 73 +++++++++++++++++++++++++++++++
include/drm/drm_mode_config.h | 6 +++
include/drm/drm_plane.h | 10 +++++
4 files changed, 96 insertions(+)
diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
index 37d2e0a4ef4b..cff189a2e751 100644
--- a/drivers/gpu/drm/drm_mode_config.c
+++ b/drivers/gpu/drm/drm_mode_config.c
@@ -379,6 +379,13 @@ static int drm_mode_create_standard_properties(struct drm_device *dev)
return -ENOMEM;
dev->mode_config.size_hints_property = prop;
+ prop = drm_property_create(dev,
+ DRM_MODE_PROP_IMMUTABLE | DRM_MODE_PROP_BLOB,
+ "IN_FORMATS_ASYNC", 0);
+ if (!prop)
+ return -ENOMEM;
+ dev->mode_config.async_modifiers_property = prop;
+
return 0;
}
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index a28b22fdd7a4..01b8e6932fda 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -141,6 +141,12 @@
* various bugs in this area with inconsistencies between the capability
* flag and per-plane properties.
*
+ * IN_FORMATS_ASYNC:
+ * Blob property which contains the set of buffer format and modifier
+ * pairs supported by this plane for asynchronous flips. The blob is a struct
+ * drm_format_modifier_blob. Without this property the plane doesn't
+ * support buffers with modifiers. Userspace cannot change this property.
+ *
* SIZE_HINTS:
* Blob property which contains the set of recommended plane size
* which can used for simple "cursor like" use cases (eg. no scaling).
@@ -249,6 +255,70 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane
return 0;
}
+static int create_in_format_async_blob(struct drm_device *dev, struct drm_plane *plane)
+{
+ const struct drm_mode_config *config = &dev->mode_config;
+ struct drm_property_blob *blob;
+ struct drm_format_modifier *async_mod;
+ size_t blob_size, async_formats_size, async_modifiers_size;
+ struct drm_format_modifier_blob *blob_data;
+ unsigned int i, j;
+
+ async_formats_size = sizeof(__u32) * plane->async_format_count;
+ if (WARN_ON(!async_formats_size)) {
+ /* 0 formats are never expected */
+ return 0;
+ }
+
+ async_modifiers_size =
+ sizeof(struct drm_format_modifier) * plane->async_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
+ * should be naturally aligned to 8B.
+ */
+ BUILD_BUG_ON(sizeof(struct drm_format_modifier_blob) % 8);
+ blob_size += ALIGN(async_formats_size, 8);
+ blob_size += async_modifiers_size;
+
+ blob = drm_property_create_blob(dev, blob_size, NULL);
+ if (IS_ERR(blob))
+ return -1;
+
+ blob_data = blob->data;
+ blob_data->version = FORMAT_BLOB_CURRENT;
+ blob_data->count_formats = plane->async_format_count;
+ blob_data->formats_offset = sizeof(struct drm_format_modifier_blob);
+ blob_data->count_modifiers = plane->async_modifier_count;
+
+ blob_data->modifiers_offset =
+ ALIGN(blob_data->formats_offset + async_formats_size, 8);
+
+ memcpy(formats_ptr(blob_data), plane->async_format_types, async_formats_size);
+
+ async_mod = modifiers_ptr(blob_data);
+ for (i = 0; i < plane->async_modifier_count; i++) {
+ for (j = 0; j < plane->async_format_count; j++) {
+ if (!plane->funcs->format_mod_supported ||
+ plane->funcs->format_mod_supported(plane,
+ plane->async_format_types[j],
+ plane->async_modifiers[i])) {
+ async_mod->formats |= 1ULL << j;
+ }
+ }
+
+ async_mod->modifier = plane->async_modifiers[i];
+ async_mod->offset = 0;
+ async_mod->pad = 0;
+ async_mod++;
+ }
+
+ drm_object_attach_property(&plane->base, config->async_modifiers_property,
+ blob->base.id);
+
+ return 0;
+}
+
/**
* DOC: hotspot properties
*
@@ -472,6 +542,9 @@ static int __drm_universal_plane_init(struct drm_device *dev,
if (format_modifier_count)
create_in_format_blob(dev, plane);
+ if (plane->async_modifier_count)
+ create_in_format_async_blob(dev, plane);
+
return 0;
}
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 271765e2e9f2..0c116d6dfd27 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -936,6 +936,12 @@ struct drm_mode_config {
*/
struct drm_property *modifiers_property;
+ /**
+ * @async_modifiers_property: Plane property to list support modifier/format
+ * combination for asynchronous flips.
+ */
+ struct drm_property *async_modifiers_property;
+
/**
* @size_hints_property: Plane SIZE_HINTS property.
*/
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index dd718c62ac31..d9571265251a 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -658,11 +658,21 @@ struct drm_plane {
*/
bool format_default;
+ /** @format_types: array of formats supported by this plane */
+ uint32_t *async_format_types;
+ /** @format_count: Size of the array pointed at by @format_types. */
+ unsigned int async_format_count;
+
/** @modifiers: array of modifiers supported by this plane */
uint64_t *modifiers;
/** @modifier_count: Size of the array pointed at by @modifier_count. */
unsigned int modifier_count;
+ /** @modifiers: array of modifiers supported by this plane */
+ uint64_t *async_modifiers;
+ /** @modifier_count: Size of the array pointed at by @modifier_count. */
+ unsigned int async_modifier_count;
+
/**
* @crtc:
*
--
2.25.1
