Add plane setting to connector configuration

[src/drm-lease-manager.git] / drm-lease-manager / lease-manager.c

diff --git a/drm-lease-manager/lease-manager.c b/drm-lease-manager/lease-manager.c
index 177a241..885ca29 100644 (file)
--- a/drm-lease-manager/lease-manager.c
+++ b/drm-lease-manager/lease-manager.c
@@ -216,17 +216,48 @@ static bool drm_find_connector(struct lm *lm, char *name, uint32_t *id)
        return false;
 }
 
-static bool lease_add_planes(struct lm *lm, struct lease *lease, int crtc_index)
+static void config_get_planes(struct lm *lm,
+                             const struct connector_config *config,
+                             int *nplanes, uint32_t **planes)
 {
-       for (uint32_t i = 0; i < lm->drm_plane_resource->count_planes; i++) {
-               uint32_t plane_id = lm->drm_plane_resource->planes[i];
+       if (config && config->planes) {
+               *nplanes = config->nplanes;
+               *planes = config->planes;
+       } else {
+               *nplanes = (int)lm->drm_plane_resource->count_planes;
+               *planes = lm->drm_plane_resource->planes;
+       }
+}
+
+static bool lease_add_planes(struct lm *lm, struct lease *lease,
+                            uint32_t crtc_index,
+                            const struct connector_config *con_config)
+{
+       int nplanes;
+       uint32_t *planes;
+       uint32_t crtc_mask = (1 << crtc_index);
+
+       /* Only allow shared planes when plane list is explicitly set */
+       bool allow_shared = con_config && con_config->planes;
+
+       config_get_planes(lm, con_config, &nplanes, &planes);
+
+       for (int i = 0; i < nplanes; i++) {
+               uint32_t plane_id = planes[i];
                drmModePlanePtr plane = drmModeGetPlane(lm->drm_fd, plane_id);
 
-               assert(plane);
+               if (!plane) {
+                       ERROR_LOG(
+                           "Unknown plane id %d configured in lease: %s\n",
+                           plane_id, lease->base.name);
+                       return false;
+               }
 
-               // Exclude planes that can be used with multiple CRTCs for now
-               if (plane->possible_crtcs == (1u << crtc_index)) {
-                       lease->object_ids[lease->nobject_ids++] = plane_id;
+               if (plane->possible_crtcs & crtc_mask) {
+                       bool shared_plane = plane->possible_crtcs != crtc_mask;
+                       if (allow_shared || !shared_plane)
+                               lease->object_ids[lease->nobject_ids++] =
+                                   plane_id;
                }
                drmModeFreePlane(plane);
        }
@@ -356,11 +387,27 @@ static struct lease *lease_create(struct lm *lm,
 
        for (int i = 0; i < nconnectors; i++) {
                uint32_t cid;
+               struct connector_config *con_config = NULL;
+
+               if (config->nconnectors > 0)
+                       con_config = &config->connectors[i];
+
+               if (con_config) {
+                       char *connector_name = con_config->name;
+                       bool optional = con_config->optional;
+
+                       bool found =
+                           drm_find_connector(lm, connector_name, &cid);
 
-               if (config->nconnectors > 0) {
-                       char *connector_name = config->connectors[i].name;
+                       bool missing_mandatory = !found && !optional;
+                       bool missing_optional = !found && optional;
 
-                       if (!drm_find_connector(lm, connector_name, &cid)) {
+                       if (missing_mandatory) {
+                               ERROR_LOG("Lease: %s, "
+                                         "mandatory connector %s not found\n",
+                                         config->lease_name, connector_name);
+                               goto err;
+                       } else if (missing_optional) {
                                WARN_LOG("Lease: %s, "
                                         "unknown DRM connector: %s\n",
                                         config->lease_name, connector_name);
@@ -388,7 +435,7 @@ static struct lease *lease_create(struct lm *lm,
                        goto err;
                }
 
-               if (!lease_add_planes(lm, lease, crtc_index))
+               if (!lease_add_planes(lm, lease, crtc_index, con_config))
                        goto err;
 
                uint32_t crtc_id = lm->drm_resource->crtcs[crtc_index];
@@ -471,6 +518,13 @@ static struct lm *drm_device_get_resources(const char *device)
                goto err;
        }
 
+       /* Enable universal planes so that ALL planes, even primary and cursor
+        * planes can be assigned from lease configurations. */
+       if (drmSetClientCap(lm->drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
+               DEBUG_LOG("drmSetClientCap failed\n");
+               goto err;
+       }
+
        lm->drm_resource = drmModeGetResources(lm->drm_fd);
        if (!lm->drm_resource) {
                ERROR_LOG("Invalid DRM device(%s)\n", device);