From nobody Thu Dec 18 09:26:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F2AEC83F24 for ; Tue, 29 Aug 2023 05:33:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235843AbjH2FdD (ORCPT ); Tue, 29 Aug 2023 01:33:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235829AbjH2Fcb (ORCPT ); Tue, 29 Aug 2023 01:32:31 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 319B61B4 for ; Mon, 28 Aug 2023 22:32:24 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1bc83a96067so23540595ad.0 for ; Mon, 28 Aug 2023 22:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693287143; x=1693891943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qkJ4KwAcx+TQGTx0OTFOcApAR7YfD4hOh7t3xGiRrRk=; b=ZQ04fzVqF2jcMlxLXhYaY/LKeEVSh4fE86ZxRRBXUUqTTsArunvANVto1TzcVboxVd rT45sjX8m2K3I6yhhz9tG/6yxD2JM9W+BwPCvyw6voAb7jkT+Sk7dKTF0+D0bWuXPL1r LZ4Z7dwBOT23nlc4n5nj3J9DohWioC8okhI5w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693287143; x=1693891943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qkJ4KwAcx+TQGTx0OTFOcApAR7YfD4hOh7t3xGiRrRk=; b=QwsQux9AUtl4i77ZAOuaUHJ18d4+p/cME6KvNtnE0cWbZJJTxn6ywVQ5MoekEkzVVb 3ZSHe4ObLseCu1MvrQO/jehj3p0c3l5rWIJkoOuzLAgVr1J62rz9BLceb1jCBINnGPK/ KVvHSVP3GgBpw/HUAS1vj2tnYcdgA9X4iw54sDEMR7Dw1tAKyjGGZ6n57RLdgeFk74Ma 04bOTZR2SUuHOfHIMECrVj5jPRE71ZuGmIcXrxolTZgbxigzb+AMM8YMdGM/8TmBvXHa i0C5yhCzwunZTO+ecMEsX8u5THAwMOFikFpMxc8y1JYXhpfpy5X/YjhQqWsqM7LgRCgD /9WQ== X-Gm-Message-State: AOJu0YwWQo9Xcr5+hwPF6u1KBgza1TKrTy56E2jAbUENFLrP3t8Wuoxn i3Sm7Pz0EqlSYhAYXK7E0kZ7ew== X-Google-Smtp-Source: AGHT+IFnu9WJp/5ngWW8gHk5i3T5TrY+fcpcRQsOJ6/BJ3XvxgJhLPt+K6XWqGpzTILbKN9q94e4RA== X-Received: by 2002:a17:903:32c6:b0:1b3:d4ed:8306 with SMTP id i6-20020a17090332c600b001b3d4ed8306mr26898562plr.19.1693287143619; Mon, 28 Aug 2023 22:32:23 -0700 (PDT) Received: from datalore.c.googlers.com.com (148.175.199.104.bc.googleusercontent.com. [104.199.175.148]) by smtp.gmail.com with ESMTPSA id g6-20020a170902c38600b001bdccf6b8c9sm8420874plg.127.2023.08.28.22.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 22:32:23 -0700 (PDT) From: Brandon Pollack To: marius.vlad@collabora.com, mairacanal@riseup.net, jshargo@chromium.org Cc: corbet@lwn.net, dri-devel@lists.freedesktop.org, hamohammed.sa@gmail.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, melissa.srw@gmail.com, mripard@kernel.org, rodrigosiqueiramelo@gmail.com, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mduggan@chromium.org, hirono@chromium.org, Brandon Pollack Subject: [PATCH v6 5/7] drm/vkms: Support enabling ConfigFS devices Date: Tue, 29 Aug 2023 05:30:57 +0000 Message-ID: <20230829053201.423261-6-brpol@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230829053201.423261-1-brpol@chromium.org> References: <20230829053201.423261-1-brpol@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jim Shargo VKMS now supports creating and using virtual devices! In addition to the enabling logic, this commit also prevents users from adding new objects once a card is registered. Signed-off-by: Jim Shargo Signed-off-by: Brandon Pollack --- drivers/gpu/drm/vkms/vkms_configfs.c | 37 ++-- drivers/gpu/drm/vkms/vkms_crtc.c | 4 +- drivers/gpu/drm/vkms/vkms_drv.c | 1 + drivers/gpu/drm/vkms/vkms_drv.h | 4 +- drivers/gpu/drm/vkms/vkms_output.c | 282 +++++++++++++++++++++++---- drivers/gpu/drm/vkms/vkms_plane.c | 10 +- 6 files changed, 282 insertions(+), 56 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vk= ms_configfs.c index dae2e85d83a1..bc35dcc47585 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -508,29 +508,40 @@ static ssize_t device_enabled_store(struct config_ite= m *item, const char *buf, { struct vkms_configfs *configfs =3D item_to_configfs(item); struct vkms_device *device; - int value, ret; + int enabled, ret; =20 - ret =3D kstrtoint(buf, 0, &value); + ret =3D kstrtoint(buf, 0, &enabled); if (ret) return ret; =20 - if (value !=3D 1) - return -EINVAL; - - mutex_lock(&configfs->lock); - - if (configfs->vkms_device) { + if (enabled =3D=3D 0) { + mutex_lock(&configfs->lock); + if (configfs->vkms_device) { + vkms_remove_device(configfs->vkms_device); + configfs->vkms_device =3D NULL; + } mutex_unlock(&configfs->lock); + return len; } =20 - device =3D vkms_add_device(configfs); - mutex_unlock(&configfs->lock); + if (enabled =3D=3D 1) { + mutex_lock(&configfs->lock); + if (!configfs->vkms_device) { + device =3D vkms_add_device(configfs); + if (IS_ERR(device)) { + mutex_unlock(&configfs->lock); + return -PTR_ERR(device); + } + + configfs->vkms_device =3D device; + } + mutex_unlock(&configfs->lock); =20 - if (IS_ERR(device)) - return -PTR_ERR(device); + return len; + } =20 - return len; + return -EINVAL; } =20 CONFIGFS_ATTR(device_, enabled); diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 74bbd675464b..2aa1c5246b7e 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -279,7 +279,7 @@ static const struct drm_crtc_helper_funcs vkms_crtc_hel= per_funcs =3D { =20 struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, struct drm_plane *primary, - struct drm_plane *cursor) + struct drm_plane *cursor, const char *name) { struct drm_device *dev =3D &vkmsdev->drm; struct vkms_crtc *vkms_crtc; @@ -291,7 +291,7 @@ struct vkms_crtc *vkms_crtc_init(struct vkms_device *vk= msdev, vkms_crtc =3D &vkmsdev->output.crtcs[vkmsdev->output.num_crtcs++]; =20 ret =3D drmm_crtc_init_with_planes(dev, &vkms_crtc->base, primary, cursor, - &vkms_crtc_funcs, NULL); + &vkms_crtc_funcs, name); if (ret) { DRM_ERROR("Failed to init CRTC\n"); goto out_error; diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 819e880a8cf7..6e7f20681890 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -275,6 +275,7 @@ struct vkms_device *vkms_add_device(struct vkms_configf= s *configfs) dev, &vkms_platform_driver.driver))) { pdev =3D to_platform_device(dev); max_id =3D max(max_id, pdev->id); + put_device(dev); } =20 pdev =3D platform_device_register_data(NULL, DRIVER_NAME, max_id + 1, diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 8cdd7949f661..2b9545ada9c2 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -250,13 +250,13 @@ void vkms_remove_device(struct vkms_device *vkms_devi= ce); /* CRTC */ struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, struct drm_plane *primary, - struct drm_plane *cursor); + struct drm_plane *cursor, const char *name); =20 int vkms_output_init(struct vkms_device *vkmsdev); int vkms_output_init_default(struct vkms_device *vkmsdev); =20 struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, - enum drm_plane_type type); + enum drm_plane_type type, char* name, ...); =20 /* 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 dc69959c5e1d..0ee1f3f4a305 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -2,8 +2,10 @@ =20 #include #include +#include #include #include +#include #include #include =20 @@ -60,7 +62,8 @@ vkms_connector_init(struct vkms_device *vkms_device) return connector; } =20 -static struct drm_encoder *vkms_encoder_init(struct vkms_device *vkms_devi= ce) +static struct drm_encoder *vkms_encoder_init(struct vkms_device *vkms_devi= ce, + char *name) { struct drm_encoder *encoder; int ret; @@ -71,7 +74,7 @@ static struct drm_encoder *vkms_encoder_init(struct vkms_= device *vkms_device) encoder =3D &vkms_device->output .encoders[vkms_device->output.num_encoders++]; ret =3D drm_encoder_init(&vkms_device->drm, encoder, &vkms_encoder_funcs, - DRM_MODE_ENCODER_VIRTUAL, NULL); + DRM_MODE_ENCODER_VIRTUAL, name); if (ret) { memset(encoder, 0, sizeof(*encoder)); vkms_device->output.num_encoders -=3D 1; @@ -82,7 +85,6 @@ static struct drm_encoder *vkms_encoder_init(struct vkms_= device *vkms_device) =20 int vkms_output_init_default(struct vkms_device *vkmsdev) { - struct vkms_output *output =3D &vkmsdev->output; struct drm_device *dev =3D &vkmsdev->drm; struct drm_connector *connector; struct drm_encoder *encoder; @@ -92,35 +94,34 @@ int vkms_output_init_default(struct vkms_device *vkmsde= v) int writeback; unsigned int n; =20 - primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY); + primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, + "default-primary-plane"); if (IS_ERR(primary)) return PTR_ERR(primary); =20 if (vkmsdev->config.overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { - struct vkms_plane *overlay =3D vkms_plane_init( - vkmsdev, DRM_PLANE_TYPE_OVERLAY); - if (IS_ERR(overlay)) { - ret =3D PTR_ERR(overlay); - goto err_planes; - } + struct vkms_plane *overlay =3D + vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, + "default-overlay-plane-%d", n); + if (IS_ERR(overlay)) + return PTR_ERR(overlay); } } =20 if (vkmsdev->config.cursor) { - cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR); - if (IS_ERR(cursor)) { - ret =3D PTR_ERR(cursor); - goto err_planes; - } + cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, + "default-cursor-plane"); + if (IS_ERR(cursor)) + return PTR_ERR(cursor); } =20 vkms_crtc =3D vkms_crtc_init(vkmsdev, &primary->base, - cursor ? &cursor->base : NULL); + cursor ? &cursor->base : NULL, + "crtc-default"); if (IS_ERR(vkms_crtc)) { DRM_ERROR("Failed to init crtc\n"); - ret =3D PTR_ERR(vkms_crtc); - goto err_planes; + return PTR_ERR(vkms_crtc); } =20 for (int i =3D 0; i < vkmsdev->output.num_planes; i++) { @@ -131,22 +132,20 @@ int vkms_output_init_default(struct vkms_device *vkms= dev) connector =3D vkms_connector_init(vkmsdev); if (IS_ERR(connector)) { DRM_ERROR("Failed to init connector\n"); - ret =3D PTR_ERR(connector); - goto err_connector; + return PTR_ERR(connector); } =20 - encoder =3D vkms_encoder_init(vkmsdev); + encoder =3D vkms_encoder_init(vkmsdev, "encoder-default"); if (IS_ERR(encoder)) { DRM_ERROR("Failed to init encoder\n"); - ret =3D PTR_ERR(encoder); - goto err_encoder; + return PTR_ERR(encoder); } encoder->possible_crtcs |=3D drm_crtc_mask(&vkms_crtc->base); =20 ret =3D drm_connector_attach_encoder(connector, encoder); if (ret) { DRM_ERROR("Failed to attach connector to encoder\n"); - goto err_attach; + return ret; } =20 if (vkmsdev->config.writeback) { @@ -158,26 +157,235 @@ int vkms_output_init_default(struct vkms_device *vkm= sdev) drm_mode_config_reset(dev); =20 return 0; +} =20 -err_attach: - drm_encoder_cleanup(encoder); - -err_encoder: - drm_connector_cleanup(connector); +static bool is_object_linked(struct vkms_config_links *links, unsigned lon= g idx) +{ + return links->linked_object_bitmap & (1 << idx); +} =20 -err_connector: - drm_crtc_cleanup(&vkms_crtc->base); +/** +* validate_vkms_configfs_no_dangling_objects - warn on unused objects in v= kms +* configfs. +* @vkmsdev: vkms device +* +* This gives slightly more visible warning messaging to the user before th= e drm +* system finds the configuration invalid and prints it's debug information= . In +* this case the user may have accidentally not included some links, or the= user +* could be testing this faulty configuration. +*/ +static void +validate_vkms_configfs_no_dangling_objects(struct vkms_device *vkmsdev) +{ + struct vkms_configfs *configfs =3D vkmsdev->configfs; + struct config_item *item; + + // 1. Planes + list_for_each_entry(item, &configfs->planes_group.cg_children, + ci_entry) { + struct vkms_config_plane *config_plane =3D + item_to_config_plane(item); + if (config_plane->possible_crtcs.linked_object_bitmap =3D=3D 0) + DRM_WARN( + "Vkms configfs created plane %s has no linked crtcs", + item->ci_name); + } =20 -err_planes: - for (int i =3D 0; i < output->num_planes; i++) - drm_plane_cleanup(&output->planes[i].base); + // 2. connectors + list_for_each_entry(item, &configfs->connectors_group.cg_children, + ci_entry) { + struct vkms_config_connector *config_connector =3D + item_to_config_connector(item); + if (config_connector->possible_encoders.linked_object_bitmap =3D=3D + 0) { + DRM_WARN( + "Vkms configfs created connector %s has no linked encoders", + item->ci_name); + } + } =20 - memset(output, 0, sizeof(*output)); + // 3. encoders + list_for_each_entry(item, &configfs->encoders_group.cg_children, + ci_entry) { + struct vkms_config_encoder *config_encoder =3D + item_to_config_encoder(item); + if (config_encoder->possible_crtcs.linked_object_bitmap =3D=3D 0) { + DRM_WARN( + "Vkms configfs created encoder %s has no linked crtcs", + item->ci_name); + } + } =20 - return ret; + // 4. crtcs only require a primary plane to function, this is checked dur= ing + // output initialization and returns an error. } =20 int vkms_output_init(struct vkms_device *vkmsdev) { - return -EOPNOTSUPP; + struct drm_device *dev =3D &vkmsdev->drm; + struct vkms_configfs *configfs =3D vkmsdev->configfs; + struct vkms_output *output =3D &vkmsdev->output; + struct plane_map { + struct vkms_config_plane *config_plane; + struct vkms_plane *plane; + } plane_map[VKMS_MAX_PLANES] =3D { 0 }; + struct encoder_map { + struct vkms_config_encoder *config_encoder; + struct drm_encoder *encoder; + } encoder_map[VKMS_MAX_OUTPUT_OBJECTS] =3D { 0 }; + struct config_item *item; + int map_idx =3D 0; + + // Ensure configfs has no unused objects, and warn if so. + validate_vkms_configfs_no_dangling_objects(vkmsdev); + + list_for_each_entry(item, &configfs->planes_group.cg_children, + ci_entry) { + struct vkms_config_plane *config_plane =3D + item_to_config_plane(item); + struct vkms_plane *plane =3D vkms_plane_init( + vkmsdev, config_plane->type, item->ci_name); + + if (IS_ERR(plane)) { + DRM_ERROR("Unable to init plane from config: %s", + item->ci_name); + return PTR_ERR(plane); + } + + plane_map[map_idx].config_plane =3D config_plane; + plane_map[map_idx].plane =3D plane; + map_idx +=3D 1; + } + + map_idx =3D 0; + list_for_each_entry(item, &configfs->encoders_group.cg_children, + ci_entry) { + struct vkms_config_encoder *config_encoder =3D + item_to_config_encoder(item); + struct drm_encoder *encoder =3D + vkms_encoder_init(vkmsdev, item->ci_name); + + if (IS_ERR(encoder)) { + DRM_ERROR("Failed to init config encoder: %s", + item->ci_name); + return PTR_ERR(encoder); + } + encoder_map[map_idx].config_encoder =3D config_encoder; + encoder_map[map_idx].encoder =3D encoder; + map_idx +=3D 1; + } + + list_for_each_entry(item, &configfs->connectors_group.cg_children, + ci_entry) { + struct vkms_config_connector *config_connector =3D + item_to_config_connector(item); + struct drm_connector *connector =3D vkms_connector_init(vkmsdev); + + if (IS_ERR(connector)) { + DRM_ERROR("Failed to init connector from config: %s", + item->ci_name); + return PTR_ERR(connector); + } + + for (int j =3D 0; j < output->num_encoders; j++) { + struct encoder_map *encoder =3D &encoder_map[j]; + + if (is_object_linked( + &config_connector->possible_encoders, + encoder->config_encoder + ->encoder_config_idx)) { + drm_connector_attach_encoder(connector, + encoder->encoder); + } + } + } + + list_for_each_entry(item, &configfs->crtcs_group.cg_children, + ci_entry) { + struct vkms_config_crtc *config_crtc =3D + item_to_config_crtc(item); + struct vkms_crtc *vkms_crtc; + struct drm_plane *primary =3D NULL, *cursor =3D NULL; + + for (int j =3D 0; j < output->num_planes; j++) { + struct plane_map *plane_entry =3D &plane_map[j]; + struct drm_plane *plane =3D &plane_entry->plane->base; + + if (!is_object_linked( + &plane_entry->config_plane->possible_crtcs, + config_crtc->crtc_config_idx)) { + continue; + } + + if (plane->type =3D=3D DRM_PLANE_TYPE_PRIMARY) { + if (primary) { + DRM_WARN( + "Too many primary planes found for crtc %s.", + item->ci_name); + return -EINVAL; + } + primary =3D plane; + } else if (plane->type =3D=3D DRM_PLANE_TYPE_CURSOR) { + if (cursor) { + DRM_WARN( + "Too many cursor planes found for crtc %s.", + item->ci_name); + return -EINVAL; + } + cursor =3D plane; + } + } + + if (!primary) { + DRM_WARN("No primary plane configured for crtc %s", + item->ci_name); + return -EINVAL; + } + + vkms_crtc =3D + vkms_crtc_init(vkmsdev, primary, cursor, item->ci_name); + if (IS_ERR(vkms_crtc)) { + DRM_WARN("Unable to init crtc from config: %s", + item->ci_name); + return PTR_ERR(vkms_crtc); + } + + for (int j =3D 0; j < output->num_planes; j++) { + struct plane_map *plane_entry =3D &plane_map[j]; + + if (!plane_entry->plane) + break; + + if (is_object_linked( + &plane_entry->config_plane->possible_crtcs, + config_crtc->crtc_config_idx)) { + plane_entry->plane->base.possible_crtcs |=3D + drm_crtc_mask(&vkms_crtc->base); + } + } + + for (int j =3D 0; j < output->num_encoders; j++) { + struct encoder_map *encoder_entry =3D &encoder_map[j]; + + if (is_object_linked(&encoder_entry->config_encoder + ->possible_crtcs, + config_crtc->crtc_config_idx)) { + encoder_entry->encoder->possible_crtcs |=3D + drm_crtc_mask(&vkms_crtc->base); + } + } + + if (vkmsdev->config.writeback) { + int ret =3D vkms_enable_writeback_connector(vkmsdev, + vkms_crtc); + if (ret) + DRM_WARN( + "Failed to init writeback connector for config crtc: %s. Error code %= d", + item->ci_name, ret); + } + } + + drm_mode_config_reset(dev); + + return 0; } diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index 950e6c930273..3198bf0dca73 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ =20 #include +#include =20 #include #include @@ -215,20 +216,25 @@ static const struct drm_plane_helper_funcs vkms_plane= _helper_funcs =3D { }; =20 struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, - enum drm_plane_type type) + enum drm_plane_type type, char *name, ...) { struct drm_device *dev =3D &vkmsdev->drm; struct vkms_output *output =3D &vkmsdev->output; struct vkms_plane *plane; + va_list va; int ret; =20 if (output->num_planes >=3D VKMS_MAX_PLANES) return ERR_PTR(-ENOMEM); =20 plane =3D &output->planes[output->num_planes++]; + + va_start(va, name); ret =3D drm_universal_plane_init(dev, &plane->base, 0, &vkms_plane_funcs, vkms_formats, ARRAY_SIZE(vkms_formats), - NULL, type, NULL); + NULL, type, name, va); + va_end(va); + if (ret) return ERR_PTR(ret); =20 --=20 2.42.0.rc2.253.gd59a3bf2b4-goog