The current vkms driver only allows the usage of one primary, eight
overlays and one cursor plane. This new configuration structure aims to
make the configuration more flexible.
Signed-off-by: Louis Chauvet <louis.chau...@bootlin.com>
---
drivers/gpu/drm/vkms/vkms_config.c | 92 ++++++++++++++++++++++++++++++++++++--
drivers/gpu/drm/vkms/vkms_config.h | 43 +++++++++++++++++-
drivers/gpu/drm/vkms/vkms_drv.h | 3 +-
drivers/gpu/drm/vkms/vkms_output.c | 37 +++++----------
drivers/gpu/drm/vkms/vkms_plane.c | 5 ++-
5 files changed, 145 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/vkms/vkms_config.c
b/drivers/gpu/drm/vkms/vkms_config.c
index
e7c7f46303e8ce4c9de68878668b855ac0fc5d2e..495056ce988ab32738701f00c94c709457aefbd3
100644
--- a/drivers/gpu/drm/vkms/vkms_config.c
+++ b/drivers/gpu/drm/vkms/vkms_config.c
@@ -14,6 +14,8 @@ struct vkms_config *vkms_config_create(void)
if (!config)
return ERR_PTR(-ENOMEM);
+ INIT_LIST_HEAD(&config->planes);
+
return config;
}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_create);
@@ -21,26 +23,105 @@ EXPORT_SYMBOL_IF_KUNIT(vkms_config_create);
struct vkms_config *vkms_config_alloc_default(bool enable_writeback, bool
enable_overlay,
bool enable_cursor)
{
+ struct vkms_config_plane *plane;
struct vkms_config *vkms_config = vkms_config_create();
if (IS_ERR(vkms_config))
return vkms_config;
vkms_config->writeback = enable_writeback;
- vkms_config->overlay = enable_overlay;
- vkms_config->cursor = enable_cursor;
+ plane = vkms_config_create_plane(vkms_config);
+ if (!plane)
+ goto err_alloc;
+
+ plane->type = DRM_PLANE_TYPE_PRIMARY;
+
+ if (enable_overlay) {
+ for (int i = 0; i < NUM_OVERLAY_PLANES; i++) {
+ plane = vkms_config_create_plane(vkms_config);
+ if (!plane)
+ goto err_alloc;
+ plane->type = DRM_PLANE_TYPE_OVERLAY;
+ }
+ }
+ if (enable_cursor) {
+ plane = vkms_config_create_plane(vkms_config);
+ if (!plane)
+ goto err_alloc;
+ plane->type = DRM_PLANE_TYPE_CURSOR;
+ }
return vkms_config;
+
+err_alloc:
+ vkms_config_destroy(vkms_config);
+ return ERR_PTR(-ENOMEM);
+}
+
+struct vkms_config_plane *vkms_config_create_plane(struct vkms_config
*vkms_config)
+{
+ if (!vkms_config)
+ return NULL;
+
+ struct vkms_config_plane *vkms_config_overlay =
kzalloc(sizeof(*vkms_config_overlay),
+ GFP_KERNEL);
+
+ if (!vkms_config_overlay)
+ return NULL;
+
+ vkms_config_overlay->type = DRM_PLANE_TYPE_OVERLAY;
+
+ list_add(&vkms_config_overlay->link, &vkms_config->planes);
+
+ return vkms_config_overlay;
+}
+EXPORT_SYMBOL_IF_KUNIT(vkms_config_create_plane);
+
+void vkms_config_delete_plane(struct vkms_config_plane *vkms_config_overlay)
+{
+ if (!vkms_config_overlay)
+ return;
+ list_del(&vkms_config_overlay->link);
+ kfree(vkms_config_overlay);
}
void vkms_config_destroy(struct vkms_config *config)
{
+ struct vkms_config_plane *vkms_config_plane, *tmp_plane;
+
+ list_for_each_entry_safe(vkms_config_plane, tmp_plane, &config->planes,
link) {
+ vkms_config_delete_plane(vkms_config_plane);
+ }
+
kfree(config);
}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_destroy);
bool vkms_config_is_valid(struct vkms_config *config)
{
+ struct vkms_config_plane *config_plane;
+
+ bool has_cursor = false;
+ bool has_primary = false;
+
+ list_for_each_entry(config_plane, &config->planes, link) {
+ if (config_plane->type == DRM_PLANE_TYPE_PRIMARY) {
+ // Multiple primary planes for only one CRTC
+ if (has_primary)
+ return false;
+ has_primary = true;
+ }
+ if (config_plane->type == DRM_PLANE_TYPE_CURSOR) {
+ // Multiple cursor planes for only one CRTC
+ if (has_cursor)
+ return false;
+ has_cursor = true;
+ }
+ }
+
+ if (!has_primary)
+ return false;
+
return true;
}
EXPORT_SYMBOL_IF_KUNIT(vkms_config_is_valid);
@@ -50,10 +131,13 @@ static int vkms_config_show(struct seq_file *m, void *data)
struct drm_debugfs_entry *entry = m->private;
struct drm_device *dev = entry->dev;
struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev);
+ struct vkms_config_plane *config_plane;
seq_printf(m, "writeback=%d\n", vkmsdev->config->writeback);
- seq_printf(m, "cursor=%d\n", vkmsdev->config->cursor);
- seq_printf(m, "overlay=%d\n", vkmsdev->config->overlay);
+ list_for_each_entry(config_plane, &vkmsdev->config->planes, link) {
+ seq_puts(m, "plane:\n");
+ seq_printf(m, "\ttype: %d\n", config_plane->type);
+ }
return 0;
}
diff --git a/drivers/gpu/drm/vkms/vkms_config.h
b/drivers/gpu/drm/vkms/vkms_config.h
index
2afb795586c6924a46dd4ba777bf22a4f51cddda..ac99f1df6d9a17bd7040a1e7a6acce14cd8fd9d0
100644
--- a/drivers/gpu/drm/vkms/vkms_config.h
+++ b/drivers/gpu/drm/vkms/vkms_config.h
@@ -10,8 +10,8 @@
* struct vkms_config - General configuration for VKMS driver
*
* @writeback: If true, a writeback buffer can be attached to the CRTC
- * @cursor: If true, a cursor plane is created in the VKMS device
- * @overlay: If true, NUM_OVERLAY_PLANES will be created for the VKMS device
+ * @planes: List of planes configured for this device. They are created by the
function
+ * vkms_config_create_plane().
* @dev: Used to store the current vkms device. Only set when the device is
instancied.
*/
struct vkms_config {
@@ -19,6 +19,27 @@ struct vkms_config {
bool cursor;
bool overlay;
struct vkms_device *dev;
+
+ struct list_head planes;
+};
+
+/**
+ * struct vkms_config_plane
+ *
+ * @link: Link to the others planes
+ * @type: Type of the plane. The creator of configuration needs to ensures
that at least one
+ * plane is primary.
+ * @plane: Internal usage. This pointer should never be considered as valid.
It can be used to
+ * store a temporary reference to a vkms plane during device creation.
This pointer is
+ * not managed by the configuration and must be managed by other means.
+ */
+struct vkms_config_plane {
+ struct list_head link;
+
+ enum drm_plane_type type;
+
+ /* Internal usage */
+ struct vkms_plane *plane;
};
/**
@@ -42,6 +63,24 @@ void vkms_config_destroy(struct vkms_config *config);
*/
bool vkms_config_is_valid(struct vkms_config *vkms_config);
+/**
+ * vkms_config_create_plane() - Create a plane configuration
+ *
+ * This will allocate and add a new plane to @vkms_config. This plane will
have by default the
+ * maximum supported values.
+ * @vkms_config: Configuration where to insert new plane
+ */
+struct vkms_config_plane *vkms_config_create_plane(struct vkms_config
*vkms_config);
+
+/**
+ * vkms_config_delete_plane() - Remove a plane configuration and frees its
memory
+ *
+ * This will delete a plane configuration from the parent configuration. This
will NOT
+ * cleanup and frees the vkms_plane that can be stored in @vkms_config_plane.
+ * @vkms_config_plane: Plane configuration to cleanup
+ */
+void vkms_config_delete_plane(struct vkms_config_plane *vkms_config_plane);
+
/**
* vkms_config_alloc_default() - Allocate the configuration for the default
device
* @enable_writeback: Enable the writeback connector for this configuration
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index
af7081c940d6c074dc01cf8180556a3d902e386d..1b5add9536f503fe224425b924c14a5217bb09b1
100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -190,6 +190,7 @@ struct vkms_output {
};
struct vkms_config;
+struct vkms_config_plane;
/**
* struct vkms_device - Description of a VKMS device
@@ -246,7 +247,7 @@ int vkms_output_init(struct vkms_device *vkmsdev);
* @type: type of plane to initialize
*/
struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
- enum drm_plane_type type);
+ struct vkms_config_plane *config);
/* CRC Support */
const char *const *vkms_get_crc_sources(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/vkms/vkms_output.c
b/drivers/gpu/drm/vkms/vkms_output.c
index
78e389d832c16e4dbaccda34fbf3215f34adeadf..cf385f676ef7f45633b4ed69a8047c87fad95dbd
100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -31,30 +31,14 @@ static const struct drm_connector_helper_funcs
vkms_conn_helper_funcs = {
int vkms_output_init(struct vkms_device *vkmsdev)
{
+ struct vkms_config_plane *config_plane;
struct drm_device *dev = &vkmsdev->drm;
struct drm_connector *connector;
struct drm_encoder *encoder;
struct vkms_output *output;
- struct vkms_plane *primary, *overlay, *cursor = NULL;
+ struct vkms_plane *primary, *cursor = NULL;
int ret;
int writeback;
- unsigned int n;
-
- /*
- * Initialize used plane. One primary plane is required to perform the
composition.
- *
- * The overlay and cursor planes are not mandatory, but can be used to
perform complex
- * composition.
- */
- primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY);
- if (IS_ERR(primary))
- return PTR_ERR(primary);
-
- if (vkmsdev->config->cursor) {
- cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR);
- if (IS_ERR(cursor))
- return PTR_ERR(cursor);
- }
output = vkms_crtc_init(dev, &primary->base,
cursor ? &cursor->base : NULL);
@@ -63,15 +47,16 @@ int vkms_output_init(struct vkms_device *vkmsdev)
return PTR_ERR(output);
}
- if (vkmsdev->config->overlay) {
- for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
- overlay = vkms_plane_init(vkmsdev,
DRM_PLANE_TYPE_OVERLAY);
- if (IS_ERR(overlay)) {
- DRM_DEV_ERROR(dev->dev, "Failed to init vkms
plane\n");
- return PTR_ERR(overlay);
- }
- overlay->base.possible_crtcs =
drm_crtc_mask(&output->crtc);
+ list_for_each_entry(config_plane, &vkmsdev->config->planes, link) {
+ config_plane->plane = vkms_plane_init(vkmsdev, config_plane);
+ if (IS_ERR(config_plane->plane)) {
+ ret = PTR_ERR(config_plane->plane);
+ return ret;
}
+ if (config_plane->type == DRM_PLANE_TYPE_PRIMARY)
+ primary = config_plane->plane;
+ else if (config_plane->type == DRM_PLANE_TYPE_CURSOR)
+ cursor = config_plane->plane;
}
connector = drmm_kzalloc(dev, sizeof(*connector), GFP_KERNEL);
diff --git a/drivers/gpu/drm/vkms/vkms_plane.c
b/drivers/gpu/drm/vkms/vkms_plane.c
index
e2fce471870f1899f2ccb66b339ce8c4332cc287..4663002c9c54030ff6243631a2a1cff26415e7a3
100644
--- a/drivers/gpu/drm/vkms/vkms_plane.c
+++ b/drivers/gpu/drm/vkms/vkms_plane.c
@@ -11,6 +11,7 @@
#include "vkms_drv.h"
#include "vkms_formats.h"
+#include "vkms_config.h"
static const u32 vkms_formats[] = {
DRM_FORMAT_ARGB8888,
@@ -187,7 +188,7 @@ static const struct drm_plane_helper_funcs
vkms_plane_helper_funcs = {
};
struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,
- enum drm_plane_type type)
+ struct vkms_config_plane *config)
{
struct drm_device *dev = &vkmsdev->drm;
struct vkms_plane *plane;
@@ -195,7 +196,7 @@ struct vkms_plane *vkms_plane_init(struct vkms_device
*vkmsdev,
plane = drmm_universal_plane_alloc(dev, struct vkms_plane, base, 0,
&vkms_plane_funcs,
vkms_formats,
ARRAY_SIZE(vkms_formats),
- NULL, type, NULL);
+ NULL, config->type, NULL);
if (IS_ERR(plane))
return plane;
--
2.47.1
