From nobody Sun Feb 8 03:27:37 2026 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 DBF8CC001B1 for ; Fri, 23 Jun 2023 22:25:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230118AbjFWWZd (ORCPT ); Fri, 23 Jun 2023 18:25:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbjFWWZc (ORCPT ); Fri, 23 Jun 2023 18:25:32 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 655F52693 for ; Fri, 23 Jun 2023 15:25:28 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3094910b150so1277647f8f.0 for ; Fri, 23 Jun 2023 15:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687559127; x=1690151127; 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=xDShF6Qfrh0D9ZEbjzdHO4vNlJH6hZ7KH6f6b8K8APA=; b=drspUz+hUGzMT9U5ivf5vWK3qfcNW9c/NVqi/JzyQT+hugXZQsd7ntaPyQuPTMeeh4 ovDjNAMdSzl/dg5pU5Cg0O1vwPivc9Gu+V/D0yQBUDPUrvuPGyt2sJvpHye2WgXMJ/0s obrmq+VEPBLo+u5JNbPPbOHLYKo5d6g57rhqQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687559127; x=1690151127; 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=xDShF6Qfrh0D9ZEbjzdHO4vNlJH6hZ7KH6f6b8K8APA=; b=JUFSOhmI1W2JqaXLldreW76LnzODaHGkpu/zU4cUvTXlKcePQmLjH7m+SNjelfg0fZ Qolusl7XOxUqRSKSfhj3xfwfxsBt8A9y3DnArCjtpmN5z9Ukh+UA8yFq03KQY9RPtXue jUVOUY+1XILUdsq0YgoehN5zVXARuLzV40Zp04+pqrSK5LCG5H+0vbH7iIIHWRHa5u60 zCafWWosza+k0shXElhrdTc0ekPvsX3EIzkrgsv449Ku+CXtzy4zf6lBtcFwaJkNCOI2 Pf3iveYJNjTqNLH/blQiqJqnz9KQEdLCYAJUMfqFTqo6X497aRI7uOdhZN7KavuaiPpm o2ug== X-Gm-Message-State: AC+VfDxFZQX7mlmGxGh0D5pzi8VX3dt8903jkwPzTfeJb9yOvSQ1tQ9Y EdccWvsKnQ4xURH7PrT4Ak7pyA== X-Google-Smtp-Source: ACHHUZ7meVCEmPXqJPKja7ki27JkhwCIGc8TspAz4yy4Va7frt40CBBAFpdlXOf1i/+GcsmA+9okQg== X-Received: by 2002:adf:dfca:0:b0:30e:432b:c54 with SMTP id q10-20020adfdfca000000b0030e432b0c54mr17827827wrn.18.1687559126902; Fri, 23 Jun 2023 15:25:26 -0700 (PDT) Received: from big-boopo.mynetworksettings.com (pool-108-46-233-209.nycmny.fios.verizon.net. [108.46.233.209]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4106000000b0030c2e3c7fb3sm453223wrp.101.2023.06.23.15.25.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 15:25:26 -0700 (PDT) From: Jim Shargo To: mairacanal@riseup.net, Daniel Vetter , David Airlie , Haneen Mohammed , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Rodrigo Siqueira , Thomas Zimmermann Cc: Jim Shargo , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] drm/vkms: Back VKMS with DRM memory management instead of static objects Date: Fri, 23 Jun 2023 18:23:43 -0400 Message-ID: <20230623222353.97283-2-jshargo@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" This is a small refactor to make ConfigFS support easier. Once we support ConfigFS, there can be multiple devices instantiated by the driver, and so moving everything into managed memory makes things much easier. This should be a no-op refactor. Signed-off-by: Jim Shargo --- drivers/gpu/drm/vkms/vkms_drv.c | 130 +++++++++++++++-------------- drivers/gpu/drm/vkms/vkms_drv.h | 4 +- drivers/gpu/drm/vkms/vkms_output.c | 6 +- 3 files changed, 72 insertions(+), 68 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index e3c9c9571c8d..f07454fff046 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -9,10 +9,12 @@ * the GPU in DRM API tests. */ =20 +#include #include #include #include =20 +#include #include #include #include @@ -37,8 +39,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 =20 -static struct vkms_config *default_config; - static bool enable_cursor =3D true; module_param_named(enable_cursor, enable_cursor, bool, 0444); MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); @@ -92,13 +92,13 @@ static void vkms_atomic_commit_tail(struct drm_atomic_s= tate *old_state) =20 static int vkms_config_show(struct seq_file *m, void *data) { - struct drm_debugfs_entry *entry =3D m->private; - struct drm_device *dev =3D entry->dev; - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); + struct drm_info_node *drm_info =3D m->private; + struct vkms_device *vkms_device =3D + drm_device_to_vkms_device(drm_info->minor->dev); =20 - seq_printf(m, "writeback=3D%d\n", vkmsdev->config->writeback); - seq_printf(m, "cursor=3D%d\n", vkmsdev->config->cursor); - seq_printf(m, "overlay=3D%d\n", vkmsdev->config->overlay); + seq_printf(m, "writeback=3D%d\n", vkms_device->config.writeback); + seq_printf(m, "cursor=3D%d\n", vkms_device->config.cursor); + seq_printf(m, "overlay=3D%d\n", vkms_device->config.overlay); =20 return 0; } @@ -155,114 +155,120 @@ static int vkms_modeset_init(struct vkms_device *vk= msdev) return vkms_output_init(vkmsdev, 0); } =20 -static int vkms_create(struct vkms_config *config) +static int vkms_platform_probe(struct platform_device *pdev) { int ret; - struct platform_device *pdev; struct vkms_device *vkms_device; + void *grp; =20 - pdev =3D platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); - - if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) { - ret =3D -ENOMEM; - goto out_unregister; + grp =3D devres_open_group(&pdev->dev, NULL, GFP_KERNEL); + if (!grp) { + return -ENOMEM; } =20 vkms_device =3D devm_drm_dev_alloc(&pdev->dev, &vkms_driver, struct vkms_device, drm); if (IS_ERR(vkms_device)) { ret =3D PTR_ERR(vkms_device); - goto out_devres; + goto out_release_group; } + vkms_device->platform =3D pdev; - vkms_device->config =3D config; - config->dev =3D vkms_device; + vkms_device->config.cursor =3D enable_cursor; + vkms_device->config.writeback =3D enable_writeback; + vkms_device->config.overlay =3D enable_overlay; =20 ret =3D dma_coerce_mask_and_coherent(vkms_device->drm.dev, DMA_BIT_MASK(64)); - if (ret) { DRM_ERROR("Could not initialize DMA support\n"); - goto out_devres; + goto out_release_group; } =20 ret =3D drm_vblank_init(&vkms_device->drm, 1); if (ret) { DRM_ERROR("Failed to vblank\n"); - goto out_devres; + goto out_release_group; } =20 ret =3D vkms_modeset_init(vkms_device); - if (ret) - goto out_devres; + if (ret) { + DRM_ERROR("Unable to initialize modesetting\n"); + goto out_release_group; + } =20 drm_debugfs_add_files(&vkms_device->drm, vkms_config_debugfs_list, ARRAY_SIZE(vkms_config_debugfs_list)); =20 ret =3D drm_dev_register(&vkms_device->drm, 0); - if (ret) - goto out_devres; + if (ret) { + DRM_ERROR("Unable to register device\n"); + return ret; + } =20 drm_fbdev_generic_setup(&vkms_device->drm, 0); + platform_set_drvdata(pdev, vkms_device); + devres_close_group(&pdev->dev, grp); =20 return 0; =20 -out_devres: - devres_release_group(&pdev->dev, NULL); -out_unregister: - platform_device_unregister(pdev); +out_release_group: + devres_release_group(&pdev->dev, grp); return ret; } =20 -static int __init vkms_init(void) +static int vkms_platform_remove(struct platform_device *pdev) { - int ret; - struct vkms_config *config; - - config =3D kmalloc(sizeof(*config), GFP_KERNEL); - if (!config) - return -ENOMEM; - - default_config =3D config; + struct vkms_device *vkms_device; =20 - config->cursor =3D enable_cursor; - config->writeback =3D enable_writeback; - config->overlay =3D enable_overlay; + vkms_device =3D platform_get_drvdata(pdev); + if (!vkms_device) + return 0; =20 - ret =3D vkms_create(config); - if (ret) - kfree(config); - - return ret; + drm_dev_unregister(&vkms_device->drm); + drm_atomic_helper_shutdown(&vkms_device->drm); + return 0; } =20 -static void vkms_destroy(struct vkms_config *config) +static struct platform_driver vkms_platform_driver =3D { + .probe =3D vkms_platform_probe, + .remove =3D vkms_platform_remove, + .driver.name =3D DRIVER_NAME, +}; + +static int __init vkms_init(void) { + int ret; struct platform_device *pdev; =20 - if (!config->dev) { - DRM_INFO("vkms_device is NULL.\n"); - return; + ret =3D platform_driver_register(&vkms_platform_driver); + if (ret) { + DRM_ERROR("Unable to register platform driver\n"); + return ret; } =20 - pdev =3D config->dev->platform; - - drm_dev_unregister(&config->dev->drm); - drm_atomic_helper_shutdown(&config->dev->drm); - devres_release_group(&pdev->dev, NULL); - platform_device_unregister(pdev); + pdev =3D platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); + if (IS_ERR(pdev)) { + platform_driver_unregister(&vkms_platform_driver); + return PTR_ERR(pdev); + } =20 - config->dev =3D NULL; + return 0; } =20 static void __exit vkms_exit(void) { - if (default_config->dev) - vkms_destroy(default_config); + struct device *dev; + + while ((dev =3D platform_find_device_by_driver( + NULL, &vkms_platform_driver.driver))) { + // platform_find_device_by_driver increments the refcount. Drop=20 + // it so we don't leak memory. + put_device(dev); + platform_device_unregister(to_platform_device(dev)); + } =20 - kfree(default_config); + platform_driver_unregister(&vkms_platform_driver); } =20 module_init(vkms_init); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 5f1a0a44a78c..e87c8aea6fb3 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -114,15 +114,13 @@ struct vkms_config { bool writeback; bool cursor; bool overlay; - /* only set when instantiated */ - struct vkms_device *dev; }; =20 struct vkms_device { struct drm_device drm; struct platform_device *platform; struct vkms_output output; - const struct vkms_config *config; + struct vkms_config config; }; =20 #define drm_crtc_to_vkms_output(target) \ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 5ce70dd946aa..963a64cf068b 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -62,7 +62,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int ind= ex) if (IS_ERR(primary)) return PTR_ERR(primary); =20 - if (vkmsdev->config->overlay) { + if (vkmsdev->config.overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { ret =3D vkms_add_overlay_plane(vkmsdev, index, crtc); if (ret) @@ -70,7 +70,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int ind= ex) } } =20 - if (vkmsdev->config->cursor) { + if (vkmsdev->config.cursor) { cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index); if (IS_ERR(cursor)) return PTR_ERR(cursor); @@ -103,7 +103,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) goto err_attach; } =20 - if (vkmsdev->config->writeback) { + if (vkmsdev->config.writeback) { writeback =3D vkms_enable_writeback_connector(vkmsdev); if (writeback) DRM_ERROR("Failed to init writeback connector\n"); --=20 2.41.0.162.gfafddb0af9-goog From nobody Sun Feb 8 03:27:37 2026 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 89618EB64DD for ; Fri, 23 Jun 2023 22:25:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230476AbjFWWZp (ORCPT ); Fri, 23 Jun 2023 18:25:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbjFWWZg (ORCPT ); Fri, 23 Jun 2023 18:25:36 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28C6D2693 for ; Fri, 23 Jun 2023 15:25:33 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-31114b46d62so1299871f8f.3 for ; Fri, 23 Jun 2023 15:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687559131; x=1690151131; 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=FkicQ8f9Of7cZkq4xhOVVHD5gN5SpnuuaR7ZuPIrTSs=; b=oMYSypqf2VIJ4sp9fklYnDaZmzRMSBoEdkyqakXjEZ+7+0mnXYM+RMcxS7Kh7F/eWs 97/rbL9QnULIeg4ohjunGtYZFzhqV4GFPlP+f6B7Ayff87LOr2BvfwcL5JLHkKTVTiY8 a5tpxpqAt48N57oORCql858Y8qrIjmDyrPEUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687559131; x=1690151131; 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=FkicQ8f9Of7cZkq4xhOVVHD5gN5SpnuuaR7ZuPIrTSs=; b=e5rgqOED6Hl/9MRRp+1kkoRdstohDwi1Dv6ps1sZtFcNy4i3VIdYUDJBgi9IuaBlqE 0e+uxDn/6haOu1JK8dQ2WOJt0UudVQie9auoyolRp3D/SR5Lu6eTHZegrsFRAAKPOwUf vC/Za3iFAjBxH+1wRoYehSmb/nkNruJUu64EEIR3N79jkXCrYAhk/+qFf4BlMZDYraAC QqbiS9JLxxMhRC1YqtBQzpWSpHdXtUPrbTpgXZknD54hb48icUw3po7UkEAMxcqSq21U L/nSl8ANU1jlh2+ID1NWiNGs4sGWFDYSrZBI9+rIMZciByq0isQqLv4Rbrm/3SI77c9f vOGg== X-Gm-Message-State: AC+VfDxHSGbxJ2YMNlZV7UvekM4WgafUbLuKmqqBKPSIz0WxkMV8ff5Q Y5IbQ/Y3UvxY0x31WTFI+MoqaQ== X-Google-Smtp-Source: ACHHUZ556wua0ZP1D126ui6nUhouD1XbUeUyh9F802BRQP2fsSqaNkDmixcgz2T+YqFY43fvbqQ31A== X-Received: by 2002:a5d:67cd:0:b0:311:1ce8:d05b with SMTP id n13-20020a5d67cd000000b003111ce8d05bmr19442456wrw.20.1687559130999; Fri, 23 Jun 2023 15:25:30 -0700 (PDT) Received: from big-boopo.mynetworksettings.com (pool-108-46-233-209.nycmny.fios.verizon.net. [108.46.233.209]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4106000000b0030c2e3c7fb3sm453223wrp.101.2023.06.23.15.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 15:25:30 -0700 (PDT) From: Jim Shargo To: mairacanal@riseup.net, Daniel Vetter , David Airlie , Haneen Mohammed , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Rodrigo Siqueira , Thomas Zimmermann Cc: Jim Shargo , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] drm/vkms: Support multiple DRM objects (crtcs, etc.) per VKMS device Date: Fri, 23 Jun 2023 18:23:44 -0400 Message-ID: <20230623222353.97283-3-jshargo@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" This change supports multiple CRTCs, encoders, connectors instead of one of each per device. Since ConfigFS-based devices will support multiple crtcs, it's useful to move all of the writeback/composition data from being per-"output" to being per-CRTC. Since there's still only ever one CRTC, this should be a no-op refactor. Signed-off-by: Jim Shargo --- drivers/gpu/drm/vkms/vkms_composer.c | 28 +++--- drivers/gpu/drm/vkms/vkms_crtc.c | 95 +++++++++++--------- drivers/gpu/drm/vkms/vkms_drv.c | 14 +-- drivers/gpu/drm/vkms/vkms_drv.h | 65 +++++++++----- drivers/gpu/drm/vkms/vkms_output.c | 123 ++++++++++++++++++-------- drivers/gpu/drm/vkms/vkms_plane.c | 44 ++++++--- drivers/gpu/drm/vkms/vkms_writeback.c | 26 +++--- 7 files changed, 252 insertions(+), 143 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 1636ce3a79f9..75fa42e0ec07 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -230,13 +230,13 @@ void vkms_composer_worker(struct work_struct *work) composer_work); struct drm_crtc *crtc =3D crtc_state->base.crtc; struct vkms_writeback_job *active_wb =3D crtc_state->active_writeback; - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); bool crc_pending, wb_pending; u64 frame_start, frame_end; u32 crc32 =3D 0; int ret; =20 - spin_lock_irq(&out->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); frame_start =3D crtc_state->frame_start; frame_end =3D crtc_state->frame_end; crc_pending =3D crtc_state->crc_pending; @@ -244,7 +244,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->frame_start =3D 0; crtc_state->frame_end =3D 0; crtc_state->crc_pending =3D false; - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); =20 /* * We raced with the vblank hrtimer and previous work already computed @@ -262,10 +262,10 @@ void vkms_composer_worker(struct work_struct *work) return; =20 if (wb_pending) { - drm_writeback_signal_completion(&out->wb_connector, 0); - spin_lock_irq(&out->composer_lock); + drm_writeback_signal_completion(&vkms_crtc->wb_connector, 0); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->wb_pending =3D false; - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); } =20 /* @@ -315,25 +315,25 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, con= st char *src_name, return 0; } =20 -void vkms_set_composer(struct vkms_output *out, bool enabled) +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled) { bool old_enabled; =20 if (enabled) - drm_crtc_vblank_get(&out->crtc); + drm_crtc_vblank_get(&vkms_crtc->base); =20 - spin_lock_irq(&out->lock); - old_enabled =3D out->composer_enabled; - out->composer_enabled =3D enabled; - spin_unlock_irq(&out->lock); + spin_lock_irq(&vkms_crtc->lock); + old_enabled =3D vkms_crtc->composer_enabled; + vkms_crtc->composer_enabled =3D enabled; + spin_unlock_irq(&vkms_crtc->lock); =20 if (old_enabled) - drm_crtc_vblank_put(&out->crtc); + drm_crtc_vblank_put(&vkms_crtc->base); } =20 int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *out =3D drm_crtc_to_vkms_crtc(crtc); bool enabled =3D false; int ret =3D 0; =20 diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 515f6772b866..d91e49c53adc 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -11,35 +11,34 @@ =20 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) { - struct vkms_output *output =3D container_of(timer, struct vkms_output, - vblank_hrtimer); - struct drm_crtc *crtc =3D &output->crtc; + struct vkms_crtc *vkms_crtc =3D timer_to_vkms_crtc(timer); + struct drm_crtc *crtc =3D &vkms_crtc->base; struct vkms_crtc_state *state; u64 ret_overrun; bool ret, fence_cookie; =20 fence_cookie =3D dma_fence_begin_signalling(); =20 - ret_overrun =3D hrtimer_forward_now(&output->vblank_hrtimer, - output->period_ns); + ret_overrun =3D hrtimer_forward_now(&vkms_crtc->vblank_hrtimer, + vkms_crtc->period_ns); if (ret_overrun !=3D 1) pr_warn("%s: vblank timer overrun\n", __func__); =20 - spin_lock(&output->lock); + spin_lock(&vkms_crtc->lock); ret =3D drm_crtc_handle_vblank(crtc); if (!ret) DRM_ERROR("vkms failure on handling vblank"); =20 - state =3D output->composer_state; - spin_unlock(&output->lock); + state =3D vkms_crtc->composer_state; + spin_unlock(&vkms_crtc->lock); =20 - if (state && output->composer_enabled) { + if (state && vkms_crtc->composer_enabled) { u64 frame =3D drm_crtc_accurate_vblank_count(crtc); =20 /* update frame_start only if a queued vkms_composer_worker() * has read the data */ - spin_lock(&output->composer_lock); + spin_lock(&vkms_crtc->composer_lock); if (!state->crc_pending) state->frame_start =3D frame; else @@ -47,9 +46,10 @@ static enum hrtimer_restart vkms_vblank_simulate(struct = hrtimer *timer) state->frame_start, frame); state->frame_end =3D frame; state->crc_pending =3D true; - spin_unlock(&output->composer_lock); + spin_unlock(&vkms_crtc->composer_lock); =20 - ret =3D queue_work(output->composer_workq, &state->composer_work); + ret =3D queue_work(vkms_crtc->composer_workq, + &state->composer_work); if (!ret) DRM_DEBUG_DRIVER("Composer worker already queued\n"); } @@ -62,25 +62,27 @@ static enum hrtimer_restart vkms_vblank_simulate(struct= hrtimer *timer) static int vkms_enable_vblank(struct drm_crtc *crtc) { struct drm_device *dev =3D crtc->dev; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); unsigned int pipe =3D drm_crtc_index(crtc); struct drm_vblank_crtc *vblank =3D &dev->vblank[pipe]; - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); =20 drm_calc_timestamping_constants(crtc, &crtc->mode); =20 - hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - out->vblank_hrtimer.function =3D &vkms_vblank_simulate; - out->period_ns =3D ktime_set(0, vblank->framedur_ns); - hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL); + hrtimer_init(&vkms_crtc->vblank_hrtimer, CLOCK_MONOTONIC, + HRTIMER_MODE_REL); + vkms_crtc->vblank_hrtimer.function =3D &vkms_vblank_simulate; + vkms_crtc->period_ns =3D ktime_set(0, vblank->framedur_ns); + hrtimer_start(&vkms_crtc->vblank_hrtimer, vkms_crtc->period_ns, + HRTIMER_MODE_REL); =20 return 0; } =20 static void vkms_disable_vblank(struct drm_crtc *crtc) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 - hrtimer_cancel(&out->vblank_hrtimer); + hrtimer_cancel(&vkms_crtc->vblank_hrtimer); } =20 static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc, @@ -88,9 +90,8 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, bool in_vblank_irq) { struct drm_device *dev =3D crtc->dev; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); unsigned int pipe =3D crtc->index; - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); - struct vkms_output *output =3D &vkmsdev->output; struct drm_vblank_crtc *vblank =3D &dev->vblank[pipe]; =20 if (!READ_ONCE(vblank->enabled)) { @@ -98,7 +99,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, return true; } =20 - *vblank_time =3D READ_ONCE(output->vblank_hrtimer.node.expires); + *vblank_time =3D READ_ONCE(vkms_crtc->vblank_hrtimer.node.expires); =20 if (WARN_ON(*vblank_time =3D=3D vblank->time)) return true; @@ -110,7 +111,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *= crtc, * the vblank core expects. Therefore we need to always correct the * timestampe by one frame. */ - *vblank_time -=3D output->period_ns; + *vblank_time -=3D vkms_crtc->period_ns; =20 return true; } @@ -236,18 +237,18 @@ static void vkms_crtc_atomic_disable(struct drm_crtc = *crtc, static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 /* This lock is held across the atomic commit to block vblank timer * from scheduling vkms_composer_worker until the composer is updated */ - spin_lock_irq(&vkms_output->lock); + spin_lock_irq(&vkms_crtc->lock); } =20 static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 if (crtc->state->event) { spin_lock(&crtc->dev->event_lock); @@ -262,9 +263,9 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crt= c, crtc->state->event =3D NULL; } =20 - vkms_output->composer_state =3D to_vkms_crtc_state(crtc->state); + vkms_crtc->composer_state =3D to_vkms_crtc_state(crtc->state); =20 - spin_unlock_irq(&vkms_output->lock); + spin_unlock_irq(&vkms_crtc->lock); } =20 static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs =3D { @@ -275,27 +276,41 @@ static const struct drm_crtc_helper_funcs vkms_crtc_h= elper_funcs =3D { .atomic_disable =3D vkms_crtc_atomic_disable, }; =20 -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor) +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, + struct drm_plane *primary, + struct drm_plane *cursor) { - struct vkms_output *vkms_out =3D drm_crtc_to_vkms_output(crtc); + struct drm_device *dev =3D &vkmsdev->drm; + struct vkms_crtc *vkms_crtc; int ret; =20 - ret =3D drmm_crtc_init_with_planes(dev, crtc, primary, cursor, + if (vkmsdev->output.num_crtcs >=3D VKMS_MAX_OUTPUT_OBJECTS) { + return ERR_PTR(-ENOMEM); + } + vkms_crtc =3D &vkmsdev->output.crtcs[vkmsdev->output.num_crtcs++]; + + ret =3D drmm_crtc_init_with_planes(dev, &vkms_crtc->base, primary, cursor, &vkms_crtc_funcs, NULL); if (ret) { DRM_ERROR("Failed to init CRTC\n"); - return ret; + goto out_error; } =20 - drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); + drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs); =20 - spin_lock_init(&vkms_out->lock); - spin_lock_init(&vkms_out->composer_lock); + spin_lock_init(&vkms_crtc->lock); + spin_lock_init(&vkms_crtc->composer_lock); =20 - vkms_out->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); - if (!vkms_out->composer_workq) - return -ENOMEM; + vkms_crtc->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); + if (!vkms_crtc->composer_workq) { + ret =3D -ENOMEM; + goto out_error; + } + + return vkms_crtc; =20 - return ret; +out_error: + memset(vkms_crtc, 0, sizeof(*vkms_crtc)); + vkmsdev->output.num_crtcs -=3D 1; + return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index f07454fff046..aa2bee82b757 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -57,8 +57,8 @@ static void vkms_release(struct drm_device *dev) { struct vkms_device *vkms =3D drm_device_to_vkms_device(dev); =20 - if (vkms->output.composer_workq) - destroy_workqueue(vkms->output.composer_workq); + for (int i =3D 0; i < vkms->output.num_crtcs; i++) + destroy_workqueue(vkms->output.crtcs[i].composer_workq); } =20 static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state) @@ -185,15 +185,15 @@ static int vkms_platform_probe(struct platform_device= *pdev) goto out_release_group; } =20 - ret =3D drm_vblank_init(&vkms_device->drm, 1); + ret =3D vkms_modeset_init(vkms_device); if (ret) { - DRM_ERROR("Failed to vblank\n"); + DRM_ERROR("Unable to initialize modesetting\n"); goto out_release_group; } =20 - ret =3D vkms_modeset_init(vkms_device); + ret =3D drm_vblank_init(&vkms_device->drm, vkms_device->output.num_crtcs); if (ret) { - DRM_ERROR("Unable to initialize modesetting\n"); + DRM_ERROR("Failed to vblank\n"); goto out_release_group; } =20 @@ -202,7 +202,7 @@ static int vkms_platform_probe(struct platform_device *= pdev) =20 ret =3D drm_dev_register(&vkms_device->drm, 0); if (ret) { - DRM_ERROR("Unable to register device\n"); + DRM_ERROR("Unable to register device with id %d\n", pdev->id); return ret; } =20 diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index e87c8aea6fb3..4c3274838ec7 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -23,6 +23,9 @@ =20 #define NUM_OVERLAY_PLANES 8 =20 +#define VKMS_MAX_OUTPUT_OBJECTS 16 +#define VKMS_MAX_PLANES (3 * VKMS_MAX_OUTPUT_OBJECTS) + struct vkms_frame_info { struct drm_framebuffer *fb; struct drm_rect src, dst; @@ -65,6 +68,25 @@ struct vkms_plane { struct drm_plane base; }; =20 +struct vkms_crtc { + struct drm_crtc base; + + struct drm_writeback_connector wb_connector; + struct hrtimer vblank_hrtimer; + ktime_t period_ns; + struct drm_pending_vblank_event *event; + /* ordered wq for composer_work */ + struct workqueue_struct *composer_workq; + /* protects concurrent access to composer */ + spinlock_t lock; + + /* protected by @lock */ + bool composer_enabled; + struct vkms_crtc_state *composer_state; + + spinlock_t composer_lock; +}; + /** * vkms_crtc_state - Driver specific CRTC state * @base: base CRTC state @@ -89,23 +111,14 @@ struct vkms_crtc_state { }; =20 struct vkms_output { - struct drm_crtc crtc; - struct drm_encoder encoder; - struct drm_connector connector; - struct drm_writeback_connector wb_connector; - struct hrtimer vblank_hrtimer; - ktime_t period_ns; - struct drm_pending_vblank_event *event; - /* ordered wq for composer_work */ - struct workqueue_struct *composer_workq; - /* protects concurrent access to composer */ - spinlock_t lock; - - /* protected by @lock */ - bool composer_enabled; - struct vkms_crtc_state *composer_state; - - spinlock_t composer_lock; + int num_crtcs; + struct vkms_crtc crtcs[VKMS_MAX_OUTPUT_OBJECTS]; + int num_encoders; + struct drm_encoder encoders[VKMS_MAX_OUTPUT_OBJECTS]; + int num_connectors; + struct drm_connector connectors[VKMS_MAX_OUTPUT_OBJECTS]; + int num_planes; + struct vkms_plane planes[VKMS_MAX_PLANES]; }; =20 struct vkms_device; @@ -123,12 +136,14 @@ struct vkms_device { struct vkms_config config; }; =20 -#define drm_crtc_to_vkms_output(target) \ - container_of(target, struct vkms_output, crtc) +#define drm_crtc_to_vkms_crtc(crtc) container_of(crtc, struct vkms_crtc, b= ase) =20 #define drm_device_to_vkms_device(target) \ container_of(target, struct vkms_device, drm) =20 +#define timer_to_vkms_crtc(timer) \ + container_of(timer, struct vkms_crtc, vblank_hrtimer) + #define to_vkms_crtc_state(target)\ container_of(target, struct vkms_crtc_state, base) =20 @@ -136,13 +151,14 @@ struct vkms_device { container_of(target, struct vkms_plane_state, base.base) =20 /* CRTC */ -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor); +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, + struct drm_plane *primary, + struct drm_plane *cursor); =20 int vkms_output_init(struct vkms_device *vkmsdev, int index); =20 struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, - enum drm_plane_type type, int index); + enum drm_plane_type type); =20 /* CRC Support */ const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, @@ -153,10 +169,11 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, con= st char *source_name, =20 /* Composer Support */ void vkms_composer_worker(struct work_struct *work); -void vkms_set_composer(struct vkms_output *out, bool enabled); +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled); void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y); =20 /* Writeback */ -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev); +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, + struct vkms_crtc *vkms_crtc); =20 #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 963a64cf068b..6b4a77780d3c 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -1,9 +1,13 @@ // SPDX-License-Identifier: GPL-2.0+ =20 -#include "vkms_drv.h" #include +#include #include +#include #include +#include + +#include "vkms_drv.h" =20 static const struct drm_connector_funcs vkms_connector_funcs =3D { .fill_modes =3D drm_helper_probe_single_connector_modes, @@ -28,74 +32,116 @@ static int vkms_conn_get_modes(struct drm_connector *c= onnector) } =20 static const struct drm_connector_helper_funcs vkms_conn_helper_funcs =3D { - .get_modes =3D vkms_conn_get_modes, + .get_modes =3D vkms_conn_get_modes, }; =20 -static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index, - struct drm_crtc *crtc) +static struct drm_connector * +vkms_connector_init(struct vkms_device *vkms_device) { - struct vkms_plane *overlay; + struct drm_connector *connector; + int ret; =20 - overlay =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index); - if (IS_ERR(overlay)) - return PTR_ERR(overlay); + if (vkms_device->output.num_connectors >=3D VKMS_MAX_OUTPUT_OBJECTS) + return ERR_PTR(-ENOMEM); =20 - if (!overlay->base.possible_crtcs) - overlay->base.possible_crtcs =3D drm_crtc_mask(crtc); + connector =3D &vkms_device->output + .connectors[vkms_device->output.num_connectors++]; + ret =3D drm_connector_init(&vkms_device->drm, connector, + &vkms_connector_funcs, + DRM_MODE_CONNECTOR_VIRTUAL); + if (ret) { + memset(connector, 0, sizeof(*connector)); + vkms_device->output.num_connectors -=3D 1; + return ERR_PTR(ret); + } =20 - return 0; + drm_connector_helper_add(connector, &vkms_conn_helper_funcs); + + return connector; +} + +static struct drm_encoder *vkms_encoder_init(struct vkms_device *vkms_devi= ce) +{ + struct drm_encoder *encoder; + int ret; + + if (vkms_device->output.num_encoders >=3D VKMS_MAX_OUTPUT_OBJECTS) + return ERR_PTR(-ENOMEM); + + 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); + if (ret) { + memset(encoder, 0, sizeof(*encoder)); + vkms_device->output.num_encoders -=3D 1; + return ERR_PTR(ret); + } + return encoder; } =20 int vkms_output_init(struct vkms_device *vkmsdev, int index) { struct vkms_output *output =3D &vkmsdev->output; struct drm_device *dev =3D &vkmsdev->drm; - struct drm_connector *connector =3D &output->connector; - struct drm_encoder *encoder =3D &output->encoder; - struct drm_crtc *crtc =3D &output->crtc; + struct drm_connector *connector; + struct drm_encoder *encoder; + struct vkms_crtc *vkms_crtc; struct vkms_plane *primary, *cursor =3D NULL; int ret; int writeback; unsigned int n; =20 - primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, index); + primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY); if (IS_ERR(primary)) return PTR_ERR(primary); =20 if (vkmsdev->config.overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { - ret =3D vkms_add_overlay_plane(vkmsdev, index, crtc); - if (ret) - return ret; + 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; + } } } =20 if (vkmsdev->config.cursor) { - cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index); - if (IS_ERR(cursor)) - return PTR_ERR(cursor); + cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR); + if (IS_ERR(cursor)) { + ret =3D PTR_ERR(cursor); + goto err_planes; + } } =20 - ret =3D vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); - if (ret) - return ret; + vkms_crtc =3D vkms_crtc_init(vkmsdev, &primary->base, + cursor ? &cursor->base : NULL); + if (IS_ERR(vkms_crtc)) { + DRM_ERROR("Failed to init crtc\n"); + ret =3D PTR_ERR(vkms_crtc); + goto err_planes; + } =20 - ret =3D drm_connector_init(dev, connector, &vkms_connector_funcs, - DRM_MODE_CONNECTOR_VIRTUAL); - if (ret) { + for (int i =3D 0; i < vkmsdev->output.num_planes; i++) { + vkmsdev->output.planes[i].base.possible_crtcs |=3D + drm_crtc_mask(&vkms_crtc->base); + } + + 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; } =20 - drm_connector_helper_add(connector, &vkms_conn_helper_funcs); - - ret =3D drm_encoder_init(dev, encoder, &vkms_encoder_funcs, - DRM_MODE_ENCODER_VIRTUAL, NULL); - if (ret) { + encoder =3D vkms_encoder_init(vkmsdev); + if (IS_ERR(encoder)) { DRM_ERROR("Failed to init encoder\n"); + ret =3D PTR_ERR(encoder); goto err_encoder; } - encoder->possible_crtcs =3D 1; + encoder->possible_crtcs |=3D drm_crtc_mask(&vkms_crtc->base); =20 ret =3D drm_connector_attach_encoder(connector, encoder); if (ret) { @@ -104,7 +150,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int i= ndex) } =20 if (vkmsdev->config.writeback) { - writeback =3D vkms_enable_writeback_connector(vkmsdev); + writeback =3D vkms_enable_writeback_connector(vkmsdev, vkms_crtc); if (writeback) DRM_ERROR("Failed to init writeback connector\n"); } @@ -120,7 +166,14 @@ int vkms_output_init(struct vkms_device *vkmsdev, int = index) drm_connector_cleanup(connector); =20 err_connector: - drm_crtc_cleanup(crtc); + drm_crtc_cleanup(&vkms_crtc->base); + +err_planes: + for (int i =3D 0; i < output->num_planes; i++) { + drm_plane_cleanup(&output->planes[i].base); + } + + memset(output, 0, sizeof(*output)); =20 return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_= plane.c index e5c625ab8e3e..f69621822c1b 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -8,6 +8,8 @@ #include #include #include +#include +#include =20 #include "vkms_drv.h" #include "vkms_formats.h" @@ -65,6 +67,20 @@ static void vkms_plane_destroy_state(struct drm_plane *p= lane, kfree(vkms_state); } =20 +static void vkms_plane_destroy(struct drm_plane *plane) +{ + struct vkms_plane *vkms_plane =3D + container_of(plane, struct vkms_plane, base); + + if (plane->state) { + vkms_plane_destroy_state(plane, plane->state); + plane->state =3D NULL; + } + + drm_plane_cleanup(plane); + memset(vkms_plane, 0, sizeof(struct vkms_plane)); +} + static void vkms_plane_reset(struct drm_plane *plane) { struct vkms_plane_state *vkms_state; @@ -84,11 +100,12 @@ static void vkms_plane_reset(struct drm_plane *plane) } =20 static const struct drm_plane_funcs vkms_plane_funcs =3D { - .update_plane =3D drm_atomic_helper_update_plane, - .disable_plane =3D drm_atomic_helper_disable_plane, - .reset =3D vkms_plane_reset, + .update_plane =3D drm_atomic_helper_update_plane, + .disable_plane =3D drm_atomic_helper_disable_plane, + .destroy =3D vkms_plane_destroy, + .reset =3D vkms_plane_reset, .atomic_duplicate_state =3D vkms_plane_duplicate_state, - .atomic_destroy_state =3D vkms_plane_destroy_state, + .atomic_destroy_state =3D vkms_plane_destroy_state, }; =20 static void vkms_plane_atomic_update(struct drm_plane *plane, @@ -198,17 +215,22 @@ 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, int index) + enum drm_plane_type type) { struct drm_device *dev =3D &vkmsdev->drm; + struct vkms_output *output =3D &vkmsdev->output; struct vkms_plane *plane; + int ret; =20 - plane =3D drmm_universal_plane_alloc(dev, struct vkms_plane, base, 1 << i= ndex, - &vkms_plane_funcs, - vkms_formats, ARRAY_SIZE(vkms_formats), - NULL, type, NULL); - if (IS_ERR(plane)) - return plane; + if (output->num_planes >=3D VKMS_MAX_PLANES) + return ERR_PTR(-ENOMEM); + + plane =3D &output->planes[output->num_planes++]; + ret =3D drm_universal_plane_init(dev, &plane->base, 0, &vkms_plane_funcs, + vkms_formats, ARRAY_SIZE(vkms_formats), + NULL, type, NULL); + if (ret) + return ERR_PTR(ret); =20 drm_plane_helper_add(&plane->base, &vkms_plane_helper_funcs); =20 diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index 84a51cd281b9..b90bcbd0a0e0 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ =20 #include +#include =20 #include #include @@ -101,7 +102,8 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob =3D job->priv; - struct vkms_device *vkmsdev; + struct vkms_crtc *vkms_crtc =3D + container_of(connector, struct vkms_crtc, wb_connector); =20 if (!job->fb) return; @@ -110,8 +112,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, =20 drm_framebuffer_put(vkmsjob->wb_frame_info.fb); =20 - vkmsdev =3D drm_device_to_vkms_device(job->fb->dev); - vkms_set_composer(&vkmsdev->output, false); + vkms_set_composer(vkms_crtc, false); kfree(vkmsjob); } =20 @@ -120,11 +121,11 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, { struct drm_connector_state *connector_state =3D drm_atomic_get_new_connec= tor_state(state, conn); - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(conn->dev); - struct vkms_output *output =3D &vkmsdev->output; - struct drm_writeback_connector *wb_conn =3D &output->wb_connector; + struct vkms_crtc *vkms_crtc =3D + drm_crtc_to_vkms_crtc(connector_state->crtc); + struct drm_writeback_connector *wb_conn =3D &vkms_crtc->wb_connector; struct drm_connector_state *conn_state =3D wb_conn->base.state; - struct vkms_crtc_state *crtc_state =3D output->composer_state; + struct vkms_crtc_state *crtc_state =3D vkms_crtc->composer_state; struct drm_framebuffer *fb =3D connector_state->writeback_job->fb; u16 crtc_height =3D crtc_state->base.crtc->mode.vdisplay; u16 crtc_width =3D crtc_state->base.crtc->mode.hdisplay; @@ -135,18 +136,18 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, if (!conn_state) return; =20 - vkms_set_composer(&vkmsdev->output, true); + vkms_set_composer(vkms_crtc, true); =20 active_wb =3D conn_state->writeback_job->priv; wb_frame_info =3D &active_wb->wb_frame_info; =20 - spin_lock_irq(&output->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->active_writeback =3D active_wb; wb_frame_info->offset =3D fb->offsets[0]; wb_frame_info->pitch =3D fb->pitches[0]; wb_frame_info->cpp =3D fb->format->cpp[0]; crtc_state->wb_pending =3D true; - spin_unlock_irq(&output->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); drm_writeback_queue_job(wb_conn, connector_state); active_wb->wb_write =3D get_line_to_frame_function(wb_format); drm_rect_init(&wb_frame_info->src, 0, 0, crtc_width, crtc_height); @@ -160,9 +161,10 @@ static const struct drm_connector_helper_funcs vkms_wb= _conn_helper_funcs =3D { .atomic_commit =3D vkms_wb_atomic_commit, }; =20 -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev) +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, + struct vkms_crtc *vkms_crtc) { - struct drm_writeback_connector *wb =3D &vkmsdev->output.wb_connector; + struct drm_writeback_connector *wb =3D &vkms_crtc->wb_connector; =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 --=20 2.41.0.162.gfafddb0af9-goog From nobody Sun Feb 8 03:27:37 2026 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 CFA00C001B1 for ; Fri, 23 Jun 2023 22:25:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230293AbjFWWZm (ORCPT ); Fri, 23 Jun 2023 18:25:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbjFWWZg (ORCPT ); Fri, 23 Jun 2023 18:25:36 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB434269F for ; Fri, 23 Jun 2023 15:25:34 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f9bece8e19so15286265e9.1 for ; Fri, 23 Jun 2023 15:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687559133; x=1690151133; 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=mKukKTNolk7o3JwLovvGiZSWB7MAEKhSelWOQgYadOg=; b=nMpjrKdcnJ8XhmRMfB91CKOQkjOP9VFD/yB0lnj8RKVvNm+yU85lRkWGQtqRoix7+3 47pIxJVbS1xpdiMdCdKV6hv+q7WMVtM2+ElPY7CbjHDjzOLt22K1p5+ndYZpo0MgD2Bt BGRG2sg6gUwO5FJDdghj8JwU5V3CjwMse3+Vg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687559133; x=1690151133; 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=mKukKTNolk7o3JwLovvGiZSWB7MAEKhSelWOQgYadOg=; b=Tpr1EMcQLB50gVp9IxMz5NbW1vaIkrAyN7hwJMyeE94EK20vj+ev7gjO07Rz1twAqu raLT8lytHDp9vgjy7seR5Or6XU2ShVpZRZyEbDRVfl16qu2+2+q9Bpqz8zZQLux+S3+z VxWXU1enpjx4Riwbs6xGvBsJCFPnrRf+XY/hnrdEpUGkZEDnSbV27WbUO7VeFnArsqkL Wd34y3EFvzfRbtdg82Gj7qqmoI1FnziKLQ3RzBs7X6vz83RUicgeezAs5eDpzAzusjtj Vkzfd8IPjEJH+/uqgZFnCzs5TRGZ0mTZbInXsVLzMCJQJ63tzk+lWDhErIXiAClEodHp CALQ== X-Gm-Message-State: AC+VfDyKzlGbuxA+9xqZXxYe4PVpKvAru1dpvVH/O5Kiis8ZkOGXtGqW 9Ip07j/hG68cBqsWFd14z0K61Q== X-Google-Smtp-Source: ACHHUZ7rsXQXJQmsIskpsoN95A1IWOFJKMU7V7NSVLFldsmXoPhlG5DDcXS3z9jdHUMyzCYrVoS/KQ== X-Received: by 2002:a5d:58d1:0:b0:30f:bcfd:c690 with SMTP id o17-20020a5d58d1000000b0030fbcfdc690mr23643997wrf.38.1687559133379; Fri, 23 Jun 2023 15:25:33 -0700 (PDT) Received: from big-boopo.mynetworksettings.com (pool-108-46-233-209.nycmny.fios.verizon.net. [108.46.233.209]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4106000000b0030c2e3c7fb3sm453223wrp.101.2023.06.23.15.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 15:25:33 -0700 (PDT) From: Jim Shargo To: mairacanal@riseup.net, Daniel Vetter , David Airlie , Haneen Mohammed , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Rodrigo Siqueira , Thomas Zimmermann Cc: Jim Shargo , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] drm/vkms: Provide platform data when creating VKMS devices Date: Fri, 23 Jun 2023 18:23:45 -0400 Message-ID: <20230623222353.97283-4-jshargo@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" This is a small refactor to make ConfigFS support easier. This should be a no-op refactor. Signed-off-by: Jim Shargo --- drivers/gpu/drm/vkms/vkms_drv.c | 13 +++++++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 9 ++++++--- drivers/gpu/drm/vkms/vkms_output.c | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index aa2bee82b757..d43121addf66 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -152,12 +152,14 @@ static int vkms_modeset_init(struct vkms_device *vkms= dev) dev->mode_config.preferred_depth =3D 0; dev->mode_config.helper_private =3D &vkms_mode_config_helpers; =20 - return vkms_output_init(vkmsdev, 0); + return vkmsdev->is_default ? vkms_output_init_default(vkmsdev) : + -ENOSYS; } =20 static int vkms_platform_probe(struct platform_device *pdev) { int ret; + struct vkms_device_setup *vkms_device_setup =3D pdev->dev.platform_data; struct vkms_device *vkms_device; void *grp; =20 @@ -177,6 +179,7 @@ static int vkms_platform_probe(struct platform_device *= pdev) vkms_device->config.cursor =3D enable_cursor; vkms_device->config.writeback =3D enable_writeback; vkms_device->config.overlay =3D enable_overlay; + vkms_device->is_default =3D vkms_device_setup->is_default; =20 ret =3D dma_coerce_mask_and_coherent(vkms_device->drm.dev, DMA_BIT_MASK(64)); @@ -240,6 +243,9 @@ static int __init vkms_init(void) { int ret; struct platform_device *pdev; + struct vkms_device_setup vkms_device_setup =3D { + .is_default =3D true, + }; =20 ret =3D platform_driver_register(&vkms_platform_driver); if (ret) { @@ -247,8 +253,11 @@ static int __init vkms_init(void) return ret; } =20 - pdev =3D platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); + pdev =3D platform_device_register_data(NULL, DRIVER_NAME, 0, + &vkms_device_setup, + sizeof(vkms_device_setup)); if (IS_ERR(pdev)) { + DRM_ERROR("Unable to register default vkms device\n"); platform_driver_unregister(&vkms_platform_driver); return PTR_ERR(pdev); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 4c3274838ec7..84b35aa1dc5a 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -121,17 +121,20 @@ struct vkms_output { struct vkms_plane planes[VKMS_MAX_PLANES]; }; =20 -struct vkms_device; - struct vkms_config { bool writeback; bool cursor; bool overlay; }; =20 +struct vkms_device_setup { + bool is_default; +}; + struct vkms_device { struct drm_device drm; struct platform_device *platform; + bool is_default; struct vkms_output output; struct vkms_config config; }; @@ -155,7 +158,7 @@ struct vkms_crtc *vkms_crtc_init(struct vkms_device *vk= msdev, struct drm_plane *primary, struct drm_plane *cursor); =20 -int vkms_output_init(struct vkms_device *vkmsdev, int index); +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); diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 6b4a77780d3c..3b5e272a8b33 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -80,7 +80,7 @@ static struct drm_encoder *vkms_encoder_init(struct vkms_= device *vkms_device) return encoder; } =20 -int vkms_output_init(struct vkms_device *vkmsdev, int index) +int vkms_output_init_default(struct vkms_device *vkmsdev) { struct vkms_output *output =3D &vkmsdev->output; struct drm_device *dev =3D &vkmsdev->drm; --=20 2.41.0.162.gfafddb0af9-goog From nobody Sun Feb 8 03:27:37 2026 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 05582EB64D7 for ; Fri, 23 Jun 2023 22:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231202AbjFWWZs (ORCPT ); Fri, 23 Jun 2023 18:25:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbjFWWZn (ORCPT ); Fri, 23 Jun 2023 18:25:43 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81A47272A for ; Fri, 23 Jun 2023 15:25:38 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-311394406d0so1178859f8f.2 for ; Fri, 23 Jun 2023 15:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687559137; x=1690151137; 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=rqUbtFMW/jmB4bWtWPy/9dwRPlA/NBdqkzPUlPdRG/g=; b=iH+eXC4Dh/eDc9yKlipYTpCJ5wrBNd8I0lPIMoi1wTVxa9+eQ1tP2WvuieYEIy535Z 1yDY0DLgQR3Zlz+XYUo59KPlkwmstiyB2q/C16YyGntJNtgv9WyH2cauUcxrCjanibj9 SeLQkQn0kige973/4QNmLPZP6QgZg3ZVYAyYc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687559137; x=1690151137; 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=rqUbtFMW/jmB4bWtWPy/9dwRPlA/NBdqkzPUlPdRG/g=; b=T2W0KZxzzQsxm9vhGd0NPKhCnG9nW0LwxBlPicM5uH1wMKsRmCLcQPs8NWH6wCXrI8 Lc1PqKaasw/NnRQAUsjXmxthOxhRRZt5McuiL1Peiv0EFcHKdQV1PFYKeA3/27epqpD6 2DQ/pkZ3+B3GzIGPOyVL4kblxgga4I90+EeuovigZr8DBahWZSN5nNYug9inOqwCHHIR ifNEcnY+eK8Vge+XmIplz/qWIF3F/6+u3zRwf7rg8Njct6uCGYkuN0cxTH4/J0LQI6SN Q1j7Kp/CA0M5+BXBxNbCc84zfPm9sTesGY/rtYUvxNygx6TilMXQg2J3wCAHz1sNrQYn pZag== X-Gm-Message-State: AC+VfDwJOF3lgI7IaXIjGTvNZGPZMddjcQxGNoaFb5di4pMWFoQ6RmBd mWMKV30ylQF4IQ4Kr1bgcgXA8w== X-Google-Smtp-Source: ACHHUZ4q0AlcrgTGeQKGbuT50c0giLfjwZK3Y0uahcuSki4RwQBWGQLKxgAPmrOgAclhfw3z2KZRnA== X-Received: by 2002:adf:cd87:0:b0:313:e1c0:3f5 with SMTP id q7-20020adfcd87000000b00313e1c003f5mr59344wrj.36.1687559136729; Fri, 23 Jun 2023 15:25:36 -0700 (PDT) Received: from big-boopo.mynetworksettings.com (pool-108-46-233-209.nycmny.fios.verizon.net. [108.46.233.209]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4106000000b0030c2e3c7fb3sm453223wrp.101.2023.06.23.15.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 15:25:36 -0700 (PDT) From: Jim Shargo To: mairacanal@riseup.net, Daniel Vetter , David Airlie , Haneen Mohammed , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Rodrigo Siqueira , Thomas Zimmermann Cc: Jim Shargo , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] drm/vkms: Add ConfigFS scaffolding to VKMS Date: Fri, 23 Jun 2023 18:23:46 -0400 Message-ID: <20230623222353.97283-5-jshargo@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" This change adds the basic scaffolding for ConfigFS, including setting up the default directories. It does not allow for the registration of configfs-backed devices, which is complex and provided in a follow-up commit. This CL includes docs about using ConfigFS with VKMS, but I'll summarize in brief here as well (assuming ConfigFS is mounted at /config/): To create a new device, you can do so via `mkdir /config/vkms/my-device`. This will create a number of directories and files automatically: /config `-- vkms `-- my-device |-- connectors |-- crtcs |-- encoders |-- planes `-- enabled You can then configure objects by mkdir'ing in each of the directories. When you're satisfied, you can `echo 1 > /config/vkms/my-device/enabled`. This will create a new device according to your configuration. For now, this will fail, but the next change will add support for it. Signed-off-by: Jim Shargo --- Documentation/gpu/vkms.rst | 17 +- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/vkms/Makefile | 1 + drivers/gpu/drm/vkms/vkms_configfs.c | 646 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 52 ++- drivers/gpu/drm/vkms/vkms_drv.h | 92 +++- drivers/gpu/drm/vkms/vkms_output.c | 5 + 7 files changed, 799 insertions(+), 15 deletions(-) create mode 100644 drivers/gpu/drm/vkms/vkms_configfs.c diff --git a/Documentation/gpu/vkms.rst b/Documentation/gpu/vkms.rst index ba04ac7c2167..2c342ef0fb7b 100644 --- a/Documentation/gpu/vkms.rst +++ b/Documentation/gpu/vkms.rst @@ -51,6 +51,12 @@ To disable the driver, use :: =20 sudo modprobe -r vkms =20 +Configuration With ConfigFS +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D + +.. kernel-doc:: drivers/gpu/drm/vkms/vkms_configfs.c + :doc: ConfigFS Support for VKMS + Testing With IGT =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 @@ -135,22 +141,15 @@ project. Runtime Configuration --------------------- =20 -We want to be able to reconfigure vkms instance without having to reload t= he -module. Use/Test-cases: +We want to vkms instances without having to reload the module. Such=20 +configuration can be added as extensions to vkms's ConfigFS support. Use-c= ases: =20 - Hotplug/hotremove connectors on the fly (to be able to test DP MST handl= ing of compositors). =20 -- Configure planes/crtcs/connectors (we'd need some code to have more than= 1 of - them first). - - Change output configuration: Plug/unplug screens, change EDID, allow cha= nging the refresh rate. =20 -The currently proposed solution is to expose vkms configuration through -configfs. All existing module options should be supported through configfs -too. - Writeback support ----------------- =20 diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index afb3b2f5f425..71eb913b378f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -262,6 +262,7 @@ config DRM_VKMS depends on DRM && MMU select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER + select CONFIGFS_FS select CRC32 default n help diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile index 1b28a6a32948..6b83907ad554 100644 --- a/drivers/gpu/drm/vkms/Makefile +++ b/drivers/gpu/drm/vkms/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only vkms-y :=3D \ + vkms_configfs.o \ vkms_drv.o \ vkms_plane.o \ vkms_output.o \ diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vk= ms_configfs.c new file mode 100644 index 000000000000..544024735d19 --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -0,0 +1,646 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include + +#include +#include + +#include "vkms_drv.h" + +/** + * DOC: ConfigFS Support for VKMS + * + * VKMS is instrumented with support for configuration via :doc:`ConfigFS + * <../filesystems/configfs>`. + * + * With VKMS installed, you can mount ConfigFS at ``/config/`` like so:: + * + * mkdir -p /config/ + * sudo mount -t configfs none /config + * + * This allows you to configure multiple virtual devices in addition to an + * immutable "default" device created by the driver at initialization time= . Note + * that the default device is immutable because we cannot pre-populate Con= figFS + * directories with normal files. + * + * To set up a new device, create a new directory under the VKMS configfs + * directory:: + * + * mkdir /config/vkms/test + * + * With your device created you'll find an new directory ready to be=20 + * configured:: + * + * /config + * `-- vkms + * |-- default + * | `-- enabled + * `-- test + * |-- connectors + * |-- crtcs + * |-- encoders + * |-- planes + * `-- enabled + * + * Each directory you add within the connectors, crtcs, encoders, and plan= es + * directories will let you configure a new object of that type. Adding new + * objects will automatically create a set of default files and folders yo= u can + * use to configure that object. + *=20 + * For instance, we can set up a two-output device like so:: + *=20 + * DRM_PLANE_TYPE_PRIMARY=3D1 + * DRM_PLANE_TYPE_CURSOR=3D2 + * DRM_PLANE_TYPE_OVERLAY=3D0 + *=20 + * mkdir /config/vkms/test/planes/primary + * echo $DRM_PLANE_TYPE_PRIMARY > /config/vkms/test/planes/primary/type + *=20 + * mkdir /config/vkms/test/planes/other_primary + * echo $DRM_PLANE_TYPE_PRIMARY > /config/vkms/test/planes/other_primary= /type + *=20 + * mkdir /config/vkms/test/planes/cursor + * echo $DRM_PLANE_TYPE_CURSOR > /config/vkms/test/planes/cursor/type + *=20 + * mkdir /config/vkms/test/planes/overlay + * echo $DRM_PLANE_TYPE_OVERLAY > /config/vkms/test/planes/overlay/type + *=20 + * mkdir /config/vkms/test/crtcs/crtc + * mkdir /config/vkms/test/crtcs/crtc_other + * mkdir /config/vkms/test/encoders/encoder + * mkdir /config/vkms/test/connectors/connector + * + * You can see that specific attributes, such as ``...//type``, can= be + * configured by writing into them. Associating objects together can be do= ne via + * symlinks:: + *=20 + * ln -s /config/vkms/test/encoders/encoder /config/vkms/test/connectors= /connector/possible_encoders + *=20 + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/encoders/encoder= /possible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/planes/primary/p= ossible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/planes/cursor/po= ssible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/planes/overlay/p= ossible_crtcs/ + *=20 + * ln -s /config/vkms/test/crtcs/crtc_other /config/vkms/test/planes/ove= rlay/possible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc_other /config/vkms/test/planes/oth= er_primary/possible_crtcs/ + *=20 + * Finally, to enable your configured device, just write 1 to the ``enable= d`` + * file:: + *=20 + * echo 1 > /config/vkms/test/enabled + * + * When you're done with the virtual device, you can clean up the device l= ike + * so:: + *=20 + * echo 0 > /config/vkms/test/enabled + * + * rm /config/vkms/test/connectors/connector/possible_encoders/encoder + * rm /config/vkms/test/encoders/encoder/possible_crtcs/crtc + * rm /config/vkms/test/planes/primary/possible_crtcs/crtc + * rm /config/vkms/test/planes/cursor/possible_crtcs/crtc + * rm /config/vkms/test/planes/overlay/possible_crtcs/crtc + * rm /config/vkms/test/planes/overlay/possible_crtcs/crtc_other + * rm /config/vkms/test/planes/other_primary/possible_crtcs/crtc_other + * + * rmdir /config/vkms/test/planes/primary + * rmdir /config/vkms/test/planes/other_primary + * rmdir /config/vkms/test/planes/cursor + * rmdir /config/vkms/test/planes/overlay + * rmdir /config/vkms/test/crtcs/crtc + * rmdir /config/vkms/test/crtcs/crtc_other + * rmdir /config/vkms/test/encoders/encoder + * rmdir /config/vkms/test/connectors/connector + * + * rmdir /config/vkms/test + */ + +/* + * Common helpers (i.e. common sub-groups) + */ + +/* Possible CRTCs, e.g. /config/vkms/device//possible_crtcs/ */ + +static struct config_item_type crtc_type; + +static int possible_crtcs_allow_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_crtc *crtc; + + if (target->ci_type !=3D &crtc_type) { + DRM_ERROR("Unable to link non-CRTCs.\n"); + return -EINVAL; + } + + crtc =3D item_to_config_crtc(target); + + if (links->linked_object_bitmap & BIT(crtc->crtc_config_idx)) { + DRM_ERROR( + "Tried to add two symlinks to the same CRTC from the same object\n"); + return -EINVAL; + } + + links->linked_object_bitmap |=3D BIT(crtc->crtc_config_idx); + + return 0; +} + +static void possible_crtcs_drop_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_crtc *crtc =3D item_to_config_crtc(target); + + links->linked_object_bitmap &=3D ~BIT(crtc->crtc_config_idx); +} + +static struct configfs_item_operations possible_crtcs_item_ops =3D { + .allow_link =3D &possible_crtcs_allow_link, + .drop_link =3D &possible_crtcs_drop_link, +}; + +static struct config_item_type possible_crtcs_group_type =3D { + .ct_item_ops =3D &possible_crtcs_item_ops, + .ct_owner =3D THIS_MODULE, +}; + +static void add_possible_crtcs(struct config_group *parent, + struct config_group *possible_crtcs) +{ + config_group_init_type_name(possible_crtcs, "possible_crtcs", + &possible_crtcs_group_type); + configfs_add_default_group(possible_crtcs, parent); +} + +/* Possible encoders, e.g. /config/vkms/device/connector/possible_encoders= / */ + +static struct config_item_type encoder_type; + +static int possible_encoders_allow_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_encoder *encoder; + + if (target->ci_type !=3D &encoder_type) { + DRM_ERROR("Unable to link non-encoders.\n"); + return -EINVAL; + } + + encoder =3D item_to_config_encoder(target); + + if (links->linked_object_bitmap & BIT(encoder->encoder_config_idx)) { + DRM_ERROR( + "Tried to add two symlinks to the same encoder from the same object\n"); + return -EINVAL; + } + + links->linked_object_bitmap |=3D BIT(encoder->encoder_config_idx); + + return 0; +} + +static void possible_encoders_drop_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_encoder *encoder =3D item_to_config_encoder(target); + + links->linked_object_bitmap &=3D ~BIT(encoder->encoder_config_idx); +} + +static struct configfs_item_operations possible_encoders_item_ops =3D { + .allow_link =3D &possible_encoders_allow_link, + .drop_link =3D &possible_encoders_drop_link, +}; + +static struct config_item_type possible_encoders_group_type =3D { + .ct_item_ops =3D &possible_encoders_item_ops, + .ct_owner =3D THIS_MODULE, +}; + +static void add_possible_encoders(struct config_group *parent, + struct config_group *possible_encoders) +{ + config_group_init_type_name(possible_encoders, "possible_encoders", + &possible_encoders_group_type); + configfs_add_default_group(possible_encoders, parent); +} + +/* + * Individual objects (connectors, crtcs, encoders, planes): + */ + +/* Connector item, e.g. /config/vkms/device/connectors/ID */ + +static struct config_item_type connector_type =3D { + .ct_owner =3D THIS_MODULE, +}; + +/* Crtc item, e.g. /config/vkms/device/crtcs/ID */ + +static struct config_item_type crtc_type =3D { + .ct_owner =3D THIS_MODULE, +}; + +/* Encoder item, e.g. /config/vkms/device/encoder/ID */ + +static struct config_item_type encoder_type =3D { + .ct_owner =3D THIS_MODULE, +}; + +/* Plane item, e.g. /config/vkms/device/planes/ID */ + +static ssize_t plane_type_show(struct config_item *item, char *buf) +{ + struct vkms_config_plane *plane =3D item_to_config_plane(item); + struct vkms_configfs *configfs =3D plane_item_to_configfs(item); + enum drm_plane_type plane_type; + + mutex_lock(&configfs->lock); + plane_type =3D plane->type; + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%u", plane_type); +} + +static ssize_t plane_type_store(struct config_item *item, const char *buf, + size_t len) +{ + struct vkms_config_plane *plane =3D item_to_config_plane(item); + struct vkms_configfs *configfs =3D plane_item_to_configfs(item); + int val, ret; + + ret =3D kstrtouint(buf, 10, &val); + if (ret) + return ret; + + if (val !=3D DRM_PLANE_TYPE_PRIMARY && val !=3D DRM_PLANE_TYPE_CURSOR && + val !=3D DRM_PLANE_TYPE_OVERLAY) + return -EINVAL; + + mutex_lock(&configfs->lock); + plane->type =3D val; + mutex_unlock(&configfs->lock); + + return len; +} + +CONFIGFS_ATTR(plane_, type); + +static struct configfs_attribute *plane_attrs[] =3D { + &plane_attr_type, + NULL, +}; + +static struct config_item_type plane_type =3D { + .ct_attrs =3D plane_attrs, + .ct_owner =3D THIS_MODULE, +}; + +/* + * Directory groups, e.g. /config/vkms/device/{planes, crtcs, ...} + */ + +/* Connectors group: /config/vkms/device/connectors/ */ + +static struct config_group *connectors_group_make(struct config_group *gro= up, + const char *name) +{ + struct vkms_config_connector *connector =3D + kzalloc(sizeof(*connector), GFP_KERNEL); + if (!connector) + return ERR_PTR(-ENOMEM); + + config_group_init_type_name(&connector->config_group, name, + &connector_type); + add_possible_encoders(&connector->config_group, + &connector->possible_encoders.group); + + return &connector->config_group; +} + +static void connectors_group_drop(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_connector *connector =3D + item_to_config_connector(item); + kfree(connector); +} + +static struct configfs_group_operations connectors_group_ops =3D { + .make_group =3D &connectors_group_make, + .drop_item =3D &connectors_group_drop, +}; + +static struct config_item_type connectors_group_type =3D { + .ct_group_ops =3D &connectors_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* CRTCs group: /config/vkms/device/crtcs/ */ + +static struct config_group *crtcs_group_make(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D + container_of(group, struct vkms_configfs, crtcs_group); + unsigned long next_idx; + struct vkms_config_crtc *crtc; + + mutex_lock(&configfs->lock); + + next_idx =3D find_first_zero_bit(&configfs->allocated_crtcs, + VKMS_MAX_OUTPUT_OBJECTS); + + if (next_idx =3D=3D VKMS_MAX_OUTPUT_OBJECTS) { + DRM_ERROR("Unable to allocate another CRTC.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + crtc =3D kzalloc(sizeof(*crtc), GFP_KERNEL); + if (!crtc) { + DRM_ERROR("Unable to allocate CRTC.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + config_group_init_type_name(&crtc->config_group, name, &crtc_type); + crtc->crtc_config_idx =3D next_idx; + + set_bit(next_idx, &configfs->allocated_crtcs); + + mutex_unlock(&configfs->lock); + + return &crtc->config_group; +} + +static void crtcs_group_drop(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_crtc *crtc =3D item_to_config_crtc(item); + kfree(crtc); +} + +static struct configfs_group_operations crtcs_group_ops =3D { + .make_group =3D &crtcs_group_make, + .drop_item =3D &crtcs_group_drop, +}; + +static struct config_item_type crtcs_group_type =3D { + .ct_group_ops =3D &crtcs_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* Encoders group: /config/vkms/device/encoders/ */ + +static struct config_group *encoders_group_make(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D + container_of(group, struct vkms_configfs, encoders_group); + unsigned long next_idx; + struct vkms_config_encoder *encoder; + + mutex_lock(&configfs->lock); + + next_idx =3D find_first_zero_bit(&configfs->allocated_encoders, + VKMS_MAX_OUTPUT_OBJECTS); + + if (next_idx =3D=3D VKMS_MAX_OUTPUT_OBJECTS) { + DRM_ERROR("Unable to allocate another encoder.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + encoder =3D kzalloc(sizeof(*encoder), GFP_KERNEL); + if (!encoder) { + DRM_ERROR("Unable to allocate encoder.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + config_group_init_type_name(&encoder->config_group, name, + &encoder_type); + add_possible_crtcs(&encoder->config_group, + &encoder->possible_crtcs.group); + encoder->encoder_config_idx =3D next_idx; + set_bit(next_idx, &configfs->allocated_encoders); + + mutex_unlock(&configfs->lock); + + return &encoder->config_group; +} + +static void encoders_group_drop(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_encoder *encoder =3D item_to_config_encoder(item); + kfree(encoder); +} + +static struct configfs_group_operations encoders_group_ops =3D { + .make_group =3D &encoders_group_make, + .drop_item =3D &encoders_group_drop, +}; + +static struct config_item_type encoders_group_type =3D { + .ct_group_ops =3D &encoders_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* Planes group: /config/vkms/device/planes/ */ + +static struct config_group *make_plane_group(struct config_group *group, + const char *name) +{ + struct vkms_config_plane *plane =3D kzalloc(sizeof(*plane), GFP_KERNEL); + if (!plane) + return ERR_PTR(-ENOMEM); + + config_group_init_type_name(&plane->config_group, name, &plane_type); + add_possible_crtcs(&plane->config_group, &plane->possible_crtcs.group); + + return &plane->config_group; +} + +static void drop_plane_group(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_plane *plane =3D item_to_config_plane(item); + kfree(plane); +} + +static struct configfs_group_operations plane_group_ops =3D { + .make_group =3D &make_plane_group, + .drop_item =3D &drop_plane_group, +}; + +static struct config_item_type planes_group_type =3D { + .ct_group_ops =3D &plane_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* Root directory group, e.g. /config/vkms/device */ + +static ssize_t device_enabled_show(struct config_item *item, char *buf) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + bool is_enabled; + + mutex_lock(&configfs->lock); + is_enabled =3D configfs->vkms_device !=3D NULL; + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%d", is_enabled); +} + +static ssize_t device_enabled_store(struct config_item *item, const char *= buf, + size_t len) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + struct vkms_device *device; + int value, ret; + + ret =3D kstrtoint(buf, 0, &value); + if (ret) + return ret; + + if (value !=3D 1) + return -EINVAL; + + mutex_lock(&configfs->lock); + + if (configfs->vkms_device) { + mutex_unlock(&configfs->lock); + return len; + } + + device =3D vkms_add_device(configfs); + mutex_unlock(&configfs->lock); + + if (IS_ERR(device)) + return -PTR_ERR(device); + + return len; +} + +CONFIGFS_ATTR(device_, enabled); + +static ssize_t device_id_show(struct config_item *item, char *buf) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + int id =3D -1; + + mutex_lock(&configfs->lock); + if (configfs->vkms_device) { + id =3D configfs->vkms_device->platform->id; + } + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%d", id); +} + +CONFIGFS_ATTR_RO(device_, id); + +static struct configfs_attribute *device_group_attrs[] =3D { + &device_attr_id, + &device_attr_enabled, + NULL, +}; + +static struct config_item_type device_group_type =3D { + .ct_attrs =3D device_group_attrs, + .ct_owner =3D THIS_MODULE, +}; + +static void vkms_configfs_setup_default_groups(struct vkms_configfs *confi= gfs, + const char *name) +{ + config_group_init_type_name(&configfs->device_group, name, + &device_group_type); + + config_group_init_type_name(&configfs->connectors_group, "connectors", + &connectors_group_type); + configfs_add_default_group(&configfs->connectors_group, + &configfs->device_group); + + config_group_init_type_name(&configfs->crtcs_group, "crtcs", + &crtcs_group_type); + configfs_add_default_group(&configfs->crtcs_group, + &configfs->device_group); + + config_group_init_type_name(&configfs->encoders_group, "encoders", + &encoders_group_type); + configfs_add_default_group(&configfs->encoders_group, + &configfs->device_group); + + config_group_init_type_name(&configfs->planes_group, "planes", + &planes_group_type); + configfs_add_default_group(&configfs->planes_group, + &configfs->device_group); +} + +/* Root directory group and subsystem, e.g. /config/vkms/ */ + +static struct config_group *make_root_group(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D kzalloc(sizeof(*configfs), GFP_KERNEL); + + if (!configfs) + return ERR_PTR(-ENOMEM); + + vkms_configfs_setup_default_groups(configfs, name); + mutex_init(&configfs->lock); + + return &configfs->device_group; +} + +static void drop_root_group(struct config_group *group, + struct config_item *item) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + + mutex_lock(&configfs->lock); + if (configfs->vkms_device) + vkms_remove_device(configfs->vkms_device); + mutex_unlock(&configfs->lock); + + kfree(configfs); +} + +static struct configfs_group_operations root_group_ops =3D { + .make_group =3D &make_root_group, + .drop_item =3D &drop_root_group, +}; + +static struct config_item_type vkms_type =3D { + .ct_group_ops =3D &root_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +static struct configfs_subsystem vkms_subsys =3D { + .su_group =3D { + .cg_item =3D { + .ci_name =3D "vkms", + .ci_type =3D &vkms_type, + }, + }, + .su_mutex =3D __MUTEX_INITIALIZER(vkms_subsys.su_mutex), +}; + +int vkms_init_configfs(void) +{ + config_group_init(&vkms_subsys.su_group); + return configfs_register_subsystem(&vkms_subsys); +} + +void vkms_unregister_configfs(void) +{ + configfs_unregister_subsystem(&vkms_subsys); +} diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index d43121addf66..1b5b7143792f 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -9,7 +9,10 @@ * the GPU in DRM API tests. */ =20 +#include #include +#include +#include #include #include #include @@ -152,8 +155,8 @@ static int vkms_modeset_init(struct vkms_device *vkmsde= v) dev->mode_config.preferred_depth =3D 0; dev->mode_config.helper_private =3D &vkms_mode_config_helpers; =20 - return vkmsdev->is_default ? vkms_output_init_default(vkmsdev) : - -ENOSYS; + return vkmsdev->configfs ? vkms_output_init(vkmsdev) : + vkms_output_init_default(vkmsdev); } =20 static int vkms_platform_probe(struct platform_device *pdev) @@ -165,6 +168,7 @@ static int vkms_platform_probe(struct platform_device *= pdev) =20 grp =3D devres_open_group(&pdev->dev, NULL, GFP_KERNEL); if (!grp) { + DRM_ERROR("Could not open devres group\n"); return -ENOMEM; } =20 @@ -179,7 +183,7 @@ static int vkms_platform_probe(struct platform_device *= pdev) vkms_device->config.cursor =3D enable_cursor; vkms_device->config.writeback =3D enable_writeback; vkms_device->config.overlay =3D enable_overlay; - vkms_device->is_default =3D vkms_device_setup->is_default; + vkms_device->configfs =3D vkms_device_setup->configfs; =20 ret =3D dma_coerce_mask_and_coherent(vkms_device->drm.dev, DMA_BIT_MASK(64)); @@ -239,12 +243,43 @@ static struct platform_driver vkms_platform_driver = =3D { .driver.name =3D DRIVER_NAME, }; =20 +struct vkms_device *vkms_add_device(struct vkms_configfs *configfs) +{ + struct device *dev =3D NULL; + struct platform_device *pdev; + int max_id =3D 1; + struct vkms_device_setup vkms_device_setup =3D { + .configfs =3D configfs, + }; + + while ((dev =3D platform_find_device_by_driver( + dev, &vkms_platform_driver.driver))) { + pdev =3D to_platform_device(dev); + max_id =3D max(max_id, pdev->id); + } + + pdev =3D platform_device_register_data(NULL, DRIVER_NAME, max_id + 1, + &vkms_device_setup, + sizeof(vkms_device_setup)); + if (IS_ERR(pdev)) { + DRM_ERROR("Unable to register vkms device'\n"); + return ERR_PTR(PTR_ERR(pdev)); + } + + return platform_get_drvdata(pdev); +} + +void vkms_remove_device(struct vkms_device *vkms_device) +{ + platform_device_unregister(vkms_device->platform); +} + static int __init vkms_init(void) { int ret; struct platform_device *pdev; struct vkms_device_setup vkms_device_setup =3D { - .is_default =3D true, + .configfs =3D NULL, }; =20 ret =3D platform_driver_register(&vkms_platform_driver); @@ -262,6 +297,13 @@ static int __init vkms_init(void) return PTR_ERR(pdev); } =20 + ret =3D vkms_init_configfs(); + if (ret) { + DRM_ERROR("Unable to initialize configfs\n"); + platform_device_unregister(pdev); + platform_driver_unregister(&vkms_platform_driver); + } + return 0; } =20 @@ -269,6 +311,8 @@ static void __exit vkms_exit(void) { struct device *dev; =20 + vkms_unregister_configfs(); + while ((dev =3D platform_find_device_by_driver( NULL, &vkms_platform_driver.driver))) { // platform_find_device_by_driver increments the refcount. Drop=20 diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 84b35aa1dc5a..3634eeeb4548 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -3,6 +3,7 @@ #ifndef _VKMS_DRV_H_ #define _VKMS_DRV_H_ =20 +#include #include =20 #include @@ -10,6 +11,7 @@ #include #include #include +#include #include =20 #define XRES_MIN 10 @@ -127,14 +129,65 @@ struct vkms_config { bool overlay; }; =20 +struct vkms_config_links { + struct config_group group; + unsigned long linked_object_bitmap; +}; + +struct vkms_config_connector { + struct config_group config_group; + struct vkms_config_links possible_encoders; +}; + +struct vkms_config_crtc { + struct config_group config_group; + unsigned long crtc_config_idx; +}; + +struct vkms_config_encoder { + struct config_group config_group; + struct vkms_config_links possible_crtcs; + unsigned long encoder_config_idx; +}; + +struct vkms_config_plane { + struct vkms_configfs *configfs; + struct config_group config_group; + struct vkms_config_links possible_crtcs; + enum drm_plane_type type; +}; + +struct vkms_configfs { + /* Directory group containing connector configs, e.g. /config/vkms/device= / */ + struct config_group device_group; + /* Directory group containing connector configs, e.g. /config/vkms/device= /connectors/ */ + struct config_group connectors_group; + /* Directory group containing CRTC configs, e.g. /config/vkms/device/crtc= s/ */ + struct config_group crtcs_group; + /* Directory group containing encoder configs, e.g. /config/vkms/device/e= ncoders/ */ + struct config_group encoders_group; + /* Directory group containing plane configs, e.g. /config/vkms/device/pla= nes/ */ + struct config_group planes_group; + + unsigned long allocated_crtcs; + unsigned long allocated_encoders; + + struct mutex lock; + + /* The platform device if this is registered, otherwise NULL */ + struct vkms_device *vkms_device; +}; + struct vkms_device_setup { - bool is_default; + // Is NULL in the case of the default card. + struct vkms_configfs *configfs; }; =20 struct vkms_device { struct drm_device drm; struct platform_device *platform; - bool is_default; + // Is NULL in the case of the default card. + struct vkms_configfs *configfs; struct vkms_output output; struct vkms_config config; }; @@ -153,11 +206,42 @@ struct vkms_device { #define to_vkms_plane_state(target)\ container_of(target, struct vkms_plane_state, base.base) =20 +#define item_to_configfs(item) \ + container_of(to_config_group(item), struct vkms_configfs, device_group) + +#define item_to_config_connector(item) \ + container_of(to_config_group(item), struct vkms_config_connector, \ + config_group) + +#define item_to_config_crtc(item) \ + container_of(to_config_group(item), struct vkms_config_crtc, \ + config_group) + +#define item_to_config_encoder(item) \ + container_of(to_config_group(item), struct vkms_config_encoder, \ + config_group) + +#define item_to_config_plane(item) \ + container_of(to_config_group(item), struct vkms_config_plane, \ + config_group) + +#define item_to_config_links(item) \ + container_of(to_config_group(item), struct vkms_config_links, group) + +#define plane_item_to_configfs(item) = \ + container_of(to_config_group(item->ci_parent), struct vkms_configfs, \ + planes_group) + +/* Devices */ +struct vkms_device *vkms_add_device(struct vkms_configfs *configfs); +void vkms_remove_device(struct vkms_device *vkms_device); + /* CRTC */ struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, struct drm_plane *primary, struct drm_plane *cursor); =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, @@ -179,4 +263,8 @@ void vkms_compose_row(struct line_buffer *stage_buffer,= struct vkms_plane_state int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_crtc *vkms_crtc); =20 +/* ConfigFS Support */ +int vkms_init_configfs(void); +void vkms_unregister_configfs(void); + #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 3b5e272a8b33..c9e6c653de19 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -177,3 +177,8 @@ int vkms_output_init_default(struct vkms_device *vkmsde= v) =20 return ret; } + +int vkms_output_init(struct vkms_device *vkmsdev) +{ + return -ENOTSUPP; +} --=20 2.41.0.162.gfafddb0af9-goog From nobody Sun Feb 8 03:27:37 2026 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 EB983C001DC for ; Fri, 23 Jun 2023 22:25:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231403AbjFWWZv (ORCPT ); Fri, 23 Jun 2023 18:25:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230369AbjFWWZo (ORCPT ); Fri, 23 Jun 2023 18:25:44 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D23F26A0 for ; Fri, 23 Jun 2023 15:25:41 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-3f8fb0e7709so14066725e9.2 for ; Fri, 23 Jun 2023 15:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687559139; x=1690151139; 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=FFPPAelyxCPieaG66w0ZiNqoMFR6anlrmZn6wmUJKro=; b=j2lzdYcZZf5HOKXT9olSBqyDHt8uaV5rAXVw5MdLfx1Hx1SAWbAB6+1XA9OfHFByjp j8ATThKloZTkAVWxwb14lNkK/ZJNQkVH1t/xlpcl484jMXwbsqlNf0mwtrgH+j4J2TMb +hIn2ym9KcSgMVydj3cO3kGJfkX+pTpHwKKGA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687559139; x=1690151139; 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=FFPPAelyxCPieaG66w0ZiNqoMFR6anlrmZn6wmUJKro=; b=B/zMtWXZfJG0K11MU+8TlVIF9S2BpHiMQQeSUrZ1lw0xryntY0raa6WCxtsCkwk0zK YHNKp0z8i/xjrzZJKauP3oW5vd9jR4og1eSoyxFpG9xJrKaPm2APhTrXHH6D4i+N2yKf XnqHfgoOlOJt/nAKAOmgDMd1iq5I93N7ufd/iuAY0Gv1j+wCfe069eKe140p0yd1Cigx xWokUXrVxQiKHru8na5sCH+OZ1diFDihyqYUPoWbA9Zucg58lZl2G+JqMdyun/mqTLBW efhfu4ImzOVP2J9OyT6zRr5sqBEp8+9Z0zKTGlDL91ktxH5ReN6IS5XvcpRWmyMzSIZf qv/Q== X-Gm-Message-State: AC+VfDwpP11sJQnlR3kDOLpg97Vk3CCTrMX/2T4t8WGDhrU9en/v7z8T 4I2Wm/9QvuRdyFmqm/qqIEmPIQ== X-Google-Smtp-Source: ACHHUZ6tYnEtdNvw2ixKzIyEGo12HfY+ZANcVmxf/nj0y4P8/u+j4T5f7ArgXw+DICl2JHwQTxgntQ== X-Received: by 2002:adf:f78f:0:b0:30f:cb0e:b283 with SMTP id q15-20020adff78f000000b0030fcb0eb283mr17891878wrp.30.1687559139580; Fri, 23 Jun 2023 15:25:39 -0700 (PDT) Received: from big-boopo.mynetworksettings.com (pool-108-46-233-209.nycmny.fios.verizon.net. [108.46.233.209]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4106000000b0030c2e3c7fb3sm453223wrp.101.2023.06.23.15.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 15:25:39 -0700 (PDT) From: Jim Shargo To: mairacanal@riseup.net, Daniel Vetter , David Airlie , Haneen Mohammed , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Rodrigo Siqueira , Thomas Zimmermann Cc: Jim Shargo , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] drm/vkms: Support enabling ConfigFS devices Date: Fri, 23 Jun 2023 18:23:47 -0400 Message-ID: <20230623222353.97283-6-jshargo@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" 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 --- drivers/gpu/drm/vkms/vkms_configfs.c | 37 +++-- drivers/gpu/drm/vkms/vkms_crtc.c | 4 +- drivers/gpu/drm/vkms/vkms_drv.c | 3 +- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- drivers/gpu/drm/vkms/vkms_output.c | 201 +++++++++++++++++++++++---- 5 files changed, 202 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vk= ms_configfs.c index 544024735d19..f5eed6d23dcd 100644 --- a/drivers/gpu/drm/vkms/vkms_configfs.c +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -504,29 +504,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 d91e49c53adc..5ebb5264f6ef 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -278,7 +278,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; @@ -290,7 +290,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 1b5b7143792f..314a04659c5f 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -210,7 +210,7 @@ static int vkms_platform_probe(struct platform_device *= pdev) ret =3D drm_dev_register(&vkms_device->drm, 0); if (ret) { DRM_ERROR("Unable to register device with id %d\n", pdev->id); - return ret; + goto out_release_group; } =20 drm_fbdev_generic_setup(&vkms_device->drm, 0); @@ -256,6 +256,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 3634eeeb4548..3d592d085f49 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -239,7 +239,7 @@ void vkms_remove_device(struct vkms_device *vkms_device= ); /* 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); diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index c9e6c653de19..806ff01954ad 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 @@ -82,7 +84,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; @@ -101,8 +102,7 @@ int vkms_output_init_default(struct vkms_device *vkmsde= v) 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; + return PTR_ERR(overlay); } } } @@ -110,17 +110,16 @@ int vkms_output_init_default(struct vkms_device *vkms= dev) 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; + 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 +130,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); 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,27 +155,175 @@ 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); +static bool is_object_linked(struct vkms_config_links *links, unsigned lon= g idx) +{ + return links->linked_object_bitmap & (1 << idx); +} =20 -err_encoder: - drm_connector_cleanup(connector); +int vkms_output_init(struct vkms_device *vkmsdev) +{ + 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; + + 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); + + if (IS_ERR(plane)) { + DRM_ERROR("Unable to init plane from config: %s", + item->ci_name); + return PTR_ERR(plane); + } =20 -err_connector: - drm_crtc_cleanup(&vkms_crtc->base); + plane_map[map_idx].config_plane =3D config_plane; + plane_map[map_idx].plane =3D plane; + map_idx +=3D 1; + } =20 -err_planes: - for (int i =3D 0; i < output->num_planes; i++) { - drm_plane_cleanup(&output->planes[i].base); + 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); + + 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; } =20 - memset(output, 0, sizeof(*output)); + 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); =20 - return ret; -} + if (IS_ERR(connector)) { + DRM_ERROR("Failed to init connector from config: %s", + item->ci_name); + return PTR_ERR(connector); + } =20 -int vkms_output_init(struct vkms_device *vkmsdev) -{ - return -ENOTSUPP; + for (int j =3D 0; j < output->num_connectors; 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; } --=20 2.41.0.162.gfafddb0af9-goog From nobody Sun Feb 8 03:27:37 2026 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 9B35CEB64DD for ; Fri, 23 Jun 2023 22:25:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231728AbjFWWZz (ORCPT ); Fri, 23 Jun 2023 18:25:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231480AbjFWWZv (ORCPT ); Fri, 23 Jun 2023 18:25:51 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69FCE2727 for ; Fri, 23 Jun 2023 15:25:43 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fa79605a3bso11268755e9.0 for ; Fri, 23 Jun 2023 15:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1687559142; x=1690151142; 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=XVDfyQp1D2UHXpL1ZVItWp64PNlbA4FYgRcewIHu8Ww=; b=PRuOCVqjhaiUIaUxHpcOBEuD6ZfRhG69YI9VhpRhJBg/QRW8qHokII2mDUDfTkEvKb j5XmH5Dnv+539X4Yu3HnU2WPe9mnfR6Lm4OVBFbS3IvhFBzZ6KHFOqoGVuXxWBd+BoMw LNLpD2UixobZWhUHVRCICdr09zBrDVUX/tFNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687559142; x=1690151142; 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=XVDfyQp1D2UHXpL1ZVItWp64PNlbA4FYgRcewIHu8Ww=; b=TQ4zZdTb9YKBx42zr3CVIIFu7IBCpGitsbSbjJEKyjT+iFYJTDWw56Fs6fE5idIseM OV/+YyWXRztKJ5EN+buGNdNlgh2xr8A0t46XIEwIbNv0NDBC4wIzkdoVFEPbO4GkUBVt 6OX3XlCErtw2UnC08uPUbDyWIoL+2pXHhDWVbKVwR2VfUWJVYfkY1Yskjc39cu0XIMIQ e0ls5GK0Uz5OuAstwJXmoVhamPGSUuxxeAco08xd5VsIRnHGTD805BCS43VrdmC8fHXF oBXFe8tV1ykiIvlEdPK2EMQtFhCT2NMUAdkIHg3B007ER7mIuNnIyRiSDGJPAXw6FOBe 4Jew== X-Gm-Message-State: AC+VfDx+jpiJHjSdPbwKUWkYPuqQFa8i3xoPiPUtILdcHVhuDM11Ezf9 9RCIbUayh+jrb9fh4qM3pjPO+A== X-Google-Smtp-Source: ACHHUZ7pe50hzgM5iLC2579qWnSeqdzLoUZ3+Orq7sbVqA9W1K1hggz4Fbs/PlyG3wmdZULYjOJhjA== X-Received: by 2002:a05:600c:138c:b0:3fa:7bf0:7a81 with SMTP id u12-20020a05600c138c00b003fa7bf07a81mr2995293wmf.0.1687559141956; Fri, 23 Jun 2023 15:25:41 -0700 (PDT) Received: from big-boopo.mynetworksettings.com (pool-108-46-233-209.nycmny.fios.verizon.net. [108.46.233.209]) by smtp.gmail.com with ESMTPSA id l6-20020a5d4106000000b0030c2e3c7fb3sm453223wrp.101.2023.06.23.15.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 15:25:41 -0700 (PDT) From: Jim Shargo To: mairacanal@riseup.net, Daniel Vetter , David Airlie , Haneen Mohammed , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Melissa Wen , Rodrigo Siqueira , Thomas Zimmermann Cc: Jim Shargo , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] drm/vkms: Add a module param to enable/disable the default device Date: Fri, 23 Jun 2023 18:23:48 -0400 Message-ID: <20230623222353.97283-7-jshargo@chromium.org> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" In many testing circumstances, we will want to just create a new device and test against that. If we create a default device, it can be annoying to have to manually select the new device instead of choosing the only one that exists. The param, enable_default, is defaulted to true to maintain backwards compatibility. Signed-off-by: Jim Shargo --- drivers/gpu/drm/vkms/vkms_drv.c | 44 ++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 314a04659c5f..1cb56c090a65 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -42,17 +42,26 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 =20 +static bool enable_default_device =3D true; +module_param_named(enable_default_device, enable_default_device, bool, 044= 4); +MODULE_PARM_DESC(enable_default_device, + "Enable/Disable creating the default device"); + static bool enable_cursor =3D true; module_param_named(enable_cursor, enable_cursor, bool, 0444); -MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); +MODULE_PARM_DESC(enable_cursor, + "Enable/Disable cursor support for the default device"); =20 static bool enable_writeback =3D true; module_param_named(enable_writeback, enable_writeback, bool, 0444); -MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector sup= port"); +MODULE_PARM_DESC( + enable_writeback, + "Enable/Disable writeback connector support for the default device"); =20 static bool enable_overlay; module_param_named(enable_overlay, enable_overlay, bool, 0444); -MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support"); +MODULE_PARM_DESC(enable_overlay, + "Enable/Disable overlay support for the default device"); =20 DEFINE_DRM_GEM_FOPS(vkms_driver_fops); =20 @@ -278,10 +287,7 @@ void vkms_remove_device(struct vkms_device *vkms_devic= e) static int __init vkms_init(void) { int ret; - struct platform_device *pdev; - struct vkms_device_setup vkms_device_setup =3D { - .configfs =3D NULL, - }; + struct platform_device *default_pdev =3D NULL; =20 ret =3D platform_driver_register(&vkms_platform_driver); if (ret) { @@ -289,19 +295,27 @@ static int __init vkms_init(void) return ret; } =20 - pdev =3D platform_device_register_data(NULL, DRIVER_NAME, 0, - &vkms_device_setup, - sizeof(vkms_device_setup)); - if (IS_ERR(pdev)) { - DRM_ERROR("Unable to register default vkms device\n"); - platform_driver_unregister(&vkms_platform_driver); - return PTR_ERR(pdev); + if (enable_default_device) { + struct vkms_device_setup vkms_device_setup =3D { + .configfs =3D NULL, + }; + + default_pdev =3D platform_device_register_data( + NULL, DRIVER_NAME, 0, &vkms_device_setup, + sizeof(vkms_device_setup)); + if (IS_ERR(default_pdev)) { + DRM_ERROR("Unable to register default vkms device\n"); + platform_driver_unregister(&vkms_platform_driver); + return PTR_ERR(default_pdev); + } } =20 ret =3D vkms_init_configfs(); if (ret) { DRM_ERROR("Unable to initialize configfs\n"); - platform_device_unregister(pdev); + if (default_pdev) + platform_device_unregister(default_pdev); + platform_driver_unregister(&vkms_platform_driver); } =20 --=20 2.41.0.162.gfafddb0af9-goog From nobody Sun Feb 8 03:27:37 2026 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 4E849C001DB for ; Tue, 8 Aug 2023 02:44:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231251AbjHHCoB (ORCPT ); Mon, 7 Aug 2023 22:44:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231214AbjHHCnr (ORCPT ); Mon, 7 Aug 2023 22:43:47 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D093E5A for ; Mon, 7 Aug 2023 19:43:42 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-686d8c8fc65so3548056b3a.0 for ; Mon, 07 Aug 2023 19:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1691462622; x=1692067422; 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=t2RLLbvfI1Ef5R0ybJCdH8zplR5QISUkXktB1IOKLp8=; b=DBqCvcnSS+NSpNKiTtJ/Q+Pm8SxfJUvOotx7o5FZJn962SWMr3/5Dhhekl19OYSxod wBMs7iRuNfcC+BDC8tf4GauQeGkopYZs7MCklyDiPuFumb5c6gBI27LiyK6642pW7Ond EohDSeFuYdeOhC1JMZOHR+t3CkiB+feTE+Jls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691462622; x=1692067422; 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=t2RLLbvfI1Ef5R0ybJCdH8zplR5QISUkXktB1IOKLp8=; b=V8cUJy7iSsYVG0CvWHTpx8n3bPg0fJ2WdQNF0QU3kBJixVm2PjvuzTlqqYCaFr7fLY XxtaU0fWKmGCHNuKmDIYRKcZSwNlENYX352VkzR3jK9RD3T3AGY9Hb6P+nNHmgH0UegY w5e84ym3ugIdhzMVTLPpuOuTIjkqZ3PPaPbYo43Zst957194og1/k5W4Rd1fYscNMfhb 2cjEvQpFdLtdrLFI/0cuvQUGHIkH8JMQLvsFmMBop1aBIz50HROaAikK337O/1UtPNSO Qrad6TUOYnj6G6ORFd0KYH6vsao2Gj9RlnfoEFB4Bol4OPD2QOdSTtldsqlGFEKoNhVp DAcA== X-Gm-Message-State: AOJu0YxaqTX9MplVjg/bnOFoQgcgL04IqW1rPz/ogT/SI8y4wEUy5hMF 4wF4M18Ub8bymBF0vSbUuTQLzT18BRSRBBCsMlF+uQ== X-Google-Smtp-Source: AGHT+IG4sObAgsZWrBlk/z4MQYZhbEtd5czlN5Xd3UbAN0hY4eUG1s3EcPzVICx4wOLmVHH88Cc6rg== X-Received: by 2002:a05:6a20:d402:b0:131:4808:d5a1 with SMTP id il2-20020a056a20d40200b001314808d5a1mr9091088pzb.28.1691462621477; Mon, 07 Aug 2023 19:43:41 -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 p23-20020aa78617000000b00662610cf7a8sm7063479pfn.172.2023.08.07.19.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 19:43:41 -0700 (PDT) From: Brandon Pollack To: jshargo@chromium.org Cc: airlied@gmail.com, corbet@lwn.net, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, hamohammed.sa@gmail.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, maarten.lankhorst@linux.intel.com, mairacanal@riseup.net, melissa.srw@gmail.com, mripard@kernel.org, rodrigosiqueiramelo@gmail.com, tzimmermann@suse.de, Brandon Pollack Subject: [PATCH] Initial backport of vkms changes from 6.4, including jshargo and brpols configs changes Date: Tue, 8 Aug 2023 02:42:34 +0000 Message-ID: <20230808024313.2220391-3-brpol@chromium.org> X-Mailer: git-send-email 2.41.0.640.ga95def55d0-goog In-Reply-To: <20230623222353.97283-1-jshargo@chromium.org> References: <20230623222353.97283-1-jshargo@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" WIP: Need to run all tast criticals and test the multidisplay tests that are WIP. BUG=3Db:283357160 TEST=3DBooted on a betty-arc-r device and ran autologin.py -a Change-Id: I13cef8cf019744813f51cfffed3d7ccb987834e8 Change-Id: Iae7d788bc4725dfdca044204fa1af27a5a1ec5a8 --- drivers/gpu/drm/vkms/Makefile | 1 + drivers/gpu/drm/vkms/vkms_composer.c | 74 ++- drivers/gpu/drm/vkms/vkms_configfs.c | 719 ++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_crtc.c | 98 ++-- drivers/gpu/drm/vkms/vkms_drv.c | 227 ++++---- drivers/gpu/drm/vkms/vkms_drv.h | 191 +++++-- drivers/gpu/drm/vkms/vkms_formats.c | 298 +++++------ drivers/gpu/drm/vkms/vkms_formats.h | 4 +- drivers/gpu/drm/vkms/vkms_output.c | 351 +++++++++++-- drivers/gpu/drm/vkms/vkms_plane.c | 102 ++-- drivers/gpu/drm/vkms/vkms_writeback.c | 33 +- include/drm/drm_fixed.h | 7 + 12 files changed, 1638 insertions(+), 467 deletions(-) create mode 100644 drivers/gpu/drm/vkms/vkms_configfs.c diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile index 1b28a6a32948..6b83907ad554 100644 --- a/drivers/gpu/drm/vkms/Makefile +++ b/drivers/gpu/drm/vkms/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only vkms-y :=3D \ + vkms_configfs.o \ vkms_drv.o \ vkms_plane.o \ vkms_output.o \ diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vk= ms_composer.c index 8e53fa80742b..61061a277fca 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -4,6 +4,7 @@ =20 #include #include +#include #include #include #include @@ -22,7 +23,7 @@ static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 al= pha) =20 /** * pre_mul_alpha_blend - alpha blending equation - * @src_frame_info: source framebuffer's metadata + * @frame_info: Source framebuffer's metadata * @stage_buffer: The line with the pixels from src_plane * @output_buffer: A line buffer that receives all the blends output * @@ -53,10 +54,30 @@ static void pre_mul_alpha_blend(struct vkms_frame_info = *frame_info, } } =20 -static bool check_y_limit(struct vkms_frame_info *frame_info, int y) +static int get_y_pos(struct vkms_frame_info *frame_info, int y) { - if (y >=3D frame_info->dst.y1 && y < frame_info->dst.y2) - return true; + if (frame_info->rotation & DRM_MODE_REFLECT_Y) + return drm_rect_height(&frame_info->rotated) - y - 1; + + switch (frame_info->rotation & DRM_MODE_ROTATE_MASK) { + case DRM_MODE_ROTATE_90: + return frame_info->rotated.x2 - y - 1; + case DRM_MODE_ROTATE_270: + return y + frame_info->rotated.x1; + default: + return y; + } +} + +static bool check_limit(struct vkms_frame_info *frame_info, int pos) +{ + if (drm_rotation_90_or_270(frame_info->rotation)) { + if (pos >=3D 0 && pos < drm_rect_width(&frame_info->rotated)) + return true; + } else { + if (pos >=3D frame_info->rotated.y1 && pos < frame_info->rotated.y2) + return true; + } =20 return false; } @@ -69,11 +90,13 @@ static void fill_background(const struct pixel_argb_u16= *background_color, } =20 /** - * @wb_frame_info: The writeback frame buffer metadata + * blend - blend the pixels from all planes and compute crc + * @wb: The writeback frame buffer metadata * @crtc_state: The crtc state * @crc32: The crc output of the final frame * @output_buffer: A buffer of a row that will receive the result of the b= lend(s) * @stage_buffer: The line with the pixels from plane being blend to the o= utput + * @row_size: The size, in bytes, of a single row * * This function blends the pixels (Using the `pre_mul_alpha_blend`) * from all planes, calculates the crc32 of the output from the former ste= p, @@ -86,6 +109,7 @@ static void blend(struct vkms_writeback_job *wb, { struct vkms_plane_state **plane =3D crtc_state->active_planes; u32 n_active_planes =3D crtc_state->num_active_planes; + int y_pos; =20 const struct pixel_argb_u16 background_color =3D { .a =3D 0xffff }; =20 @@ -96,10 +120,12 @@ static void blend(struct vkms_writeback_job *wb, =20 /* The active planes are composed associatively in z-order. */ for (size_t i =3D 0; i < n_active_planes; i++) { - if (!check_y_limit(plane[i]->frame_info, y)) + y_pos =3D get_y_pos(plane[i]->frame_info, y); + + if (!check_limit(plane[i]->frame_info, y_pos)) continue; =20 - plane[i]->plane_read(stage_buffer, plane[i]->frame_info, y); + vkms_compose_row(stage_buffer, plane[i], y_pos); pre_mul_alpha_blend(plane[i]->frame_info, stage_buffer, output_buffer); } @@ -107,7 +133,7 @@ static void blend(struct vkms_writeback_job *wb, *crc32 =3D crc32_le(*crc32, (void *)output_buffer->pixels, row_size); =20 if (wb) - wb->wb_write(&wb->wb_frame_info, output_buffer, y); + vkms_writeback_row(wb, output_buffer, y_pos); } } =20 @@ -118,10 +144,10 @@ static int check_format_funcs(struct vkms_crtc_state = *crtc_state, u32 n_active_planes =3D crtc_state->num_active_planes; =20 for (size_t i =3D 0; i < n_active_planes; i++) - if (!planes[i]->plane_read) + if (!planes[i]->pixel_read) return -1; =20 - if (active_wb && !active_wb->wb_write) + if (active_wb && !active_wb->pixel_write) return -1; =20 return 0; @@ -204,13 +230,13 @@ void vkms_composer_worker(struct work_struct *work) composer_work); struct drm_crtc *crtc =3D crtc_state->base.crtc; struct vkms_writeback_job *active_wb =3D crtc_state->active_writeback; - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); bool crc_pending, wb_pending; u64 frame_start, frame_end; u32 crc32 =3D 0; int ret; =20 - spin_lock_irq(&out->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); frame_start =3D crtc_state->frame_start; frame_end =3D crtc_state->frame_end; crc_pending =3D crtc_state->crc_pending; @@ -218,7 +244,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->frame_start =3D 0; crtc_state->frame_end =3D 0; crtc_state->crc_pending =3D false; - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); =20 /* * We raced with the vblank hrtimer and previous work already computed @@ -236,10 +262,10 @@ void vkms_composer_worker(struct work_struct *work) return; =20 if (wb_pending) { - drm_writeback_signal_completion(&out->wb_connector, 0); - spin_lock_irq(&out->composer_lock); + drm_writeback_signal_completion(&vkms_crtc->wb_connector, 0); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->wb_pending =3D false; - spin_unlock_irq(&out->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); } =20 /* @@ -289,25 +315,25 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, con= st char *src_name, return 0; } =20 -void vkms_set_composer(struct vkms_output *out, bool enabled) +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled) { bool old_enabled; =20 if (enabled) - drm_crtc_vblank_get(&out->crtc); + drm_crtc_vblank_get(&vkms_crtc->base); =20 - spin_lock_irq(&out->lock); - old_enabled =3D out->composer_enabled; - out->composer_enabled =3D enabled; - spin_unlock_irq(&out->lock); + spin_lock_irq(&vkms_crtc->lock); + old_enabled =3D vkms_crtc->composer_enabled; + vkms_crtc->composer_enabled =3D enabled; + spin_unlock_irq(&vkms_crtc->lock); =20 if (old_enabled) - drm_crtc_vblank_put(&out->crtc); + drm_crtc_vblank_put(&vkms_crtc->base); } =20 int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *out =3D drm_crtc_to_vkms_crtc(crtc); bool enabled =3D false; int ret =3D 0; =20 diff --git a/drivers/gpu/drm/vkms/vkms_configfs.c b/drivers/gpu/drm/vkms/vk= ms_configfs.c new file mode 100644 index 000000000000..a1ac7716ba1a --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_configfs.c @@ -0,0 +1,719 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "drm/drm_probe_helper.h" +#include +#include +#include + +#include +#include + +#include "vkms_drv.h" + +/** + * DOC: ConfigFS Support for VKMS + * + * VKMS is instrumented with support for configuration via :doc:`ConfigFS + * <../filesystems/configfs>`. + * + * With VKMS installed, you can mount ConfigFS at ``/config/`` like so:: + * + * mkdir -p /config/ + * sudo mount -t configfs none /config + * + * This allows you to configure multiple virtual devices in addition to an + * immutable "default" device created by the driver at initialization time= . Note + * that the default device is immutable because we cannot pre-populate Con= figFS + * directories with normal files. + * + * To set up a new device, create a new directory under the VKMS configfs + * directory:: + * + * mkdir /config/vkms/test + * + * With your device created you'll find an new directory ready to be + * configured:: + * + * /config + * `-- vkms + * |-- default + * | `-- enabled + * `-- test + * |-- connectors + * `-- connected + * |-- crtcs + * |-- encoders + * |-- planes + * `-- enabled + * + * Each directory you add within the connectors, crtcs, encoders, and plan= es + * directories will let you configure a new object of that type. Adding new + * objects will automatically create a set of default files and folders yo= u can + * use to configure that object. + * + * For instance, we can set up a two-output device like so:: + * + * DRM_PLANE_TYPE_PRIMARY=3D1 + * DRM_PLANE_TYPE_CURSOR=3D2 + * DRM_PLANE_TYPE_OVERLAY=3D0 + * + * mkdir /config/vkms/test/planes/primary + * echo $DRM_PLANE_TYPE_PRIMARY > /config/vkms/test/planes/primary/type + * + * mkdir /config/vkms/test/planes/other_primary + * echo $DRM_PLANE_TYPE_PRIMARY > /config/vkms/test/planes/other_primary= /type + * + * mkdir /config/vkms/test/planes/cursor + * echo $DRM_PLANE_TYPE_CURSOR > /config/vkms/test/planes/cursor/type + * + * mkdir /config/vkms/test/planes/overlay + * echo $DRM_PLANE_TYPE_OVERLAY > /config/vkms/test/planes/overlay/type + * + * mkdir /config/vkms/test/crtcs/crtc + * mkdir /config/vkms/test/crtcs/crtc_other + * mkdir /config/vkms/test/encoders/encoder + * mkdir /config/vkms/test/connectors/connector + * + * You can see that specific attributes, such as ``...//type``, can= be + * configured by writing into them. Associating objects together can be do= ne via + * symlinks:: + * + * ln -s /config/vkms/test/encoders/encoder /config/vkms/test/connectors= /connector/possible_encoders + * + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/encoders/encoder= /possible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/planes/primary/p= ossible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/planes/cursor/po= ssible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc /config/vkms/test/planes/overlay/p= ossible_crtcs/ + * + * ln -s /config/vkms/test/crtcs/crtc_other /config/vkms/test/planes/ove= rlay/possible_crtcs/ + * ln -s /config/vkms/test/crtcs/crtc_other /config/vkms/test/planes/oth= er_primary/possible_crtcs/ + * + * Finally, to enable your configured device, just write 1 to the ``enable= d`` + * file:: + * + * echo 1 > /config/vkms/test/enabled + * + * By default no display is "connected" so to connect a connector you'll a= lso + * have to write 1 to a connectors "connected" attribute:: + * + * echo 1 > /config/vkms/test/connectors/connector/connected + * + * One can verify that this is worked using the `modetest` utility or the + * equivalent for your platform. + * + * When you're done with the virtual device, you can clean up the device l= ike + * so:: + * + * echo 0 > /config/vkms/test/enabled + * + * rm /config/vkms/test/connectors/connector/possible_encoders/encoder + * rm /config/vkms/test/encoders/encoder/possible_crtcs/crtc + * rm /config/vkms/test/planes/primary/possible_crtcs/crtc + * rm /config/vkms/test/planes/cursor/possible_crtcs/crtc + * rm /config/vkms/test/planes/overlay/possible_crtcs/crtc + * rm /config/vkms/test/planes/overlay/possible_crtcs/crtc_other + * rm /config/vkms/test/planes/other_primary/possible_crtcs/crtc_other + * + * rmdir /config/vkms/test/planes/primary + * rmdir /config/vkms/test/planes/other_primary + * rmdir /config/vkms/test/planes/cursor + * rmdir /config/vkms/test/planes/overlay + * rmdir /config/vkms/test/crtcs/crtc + * rmdir /config/vkms/test/crtcs/crtc_other + * rmdir /config/vkms/test/encoders/encoder + * rmdir /config/vkms/test/connectors/connector + * + * rmdir /config/vkms/test + */ + +/* + * Common helpers (i.e. common sub-groups) + */ + +/* Possible CRTCs, e.g. /config/vkms/device//possible_crtcs/ */ + +static struct config_item_type crtc_type; + +static int possible_crtcs_allow_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_crtc *crtc; + + if (target->ci_type !=3D &crtc_type) { + DRM_ERROR("Unable to link non-CRTCs.\n"); + return -EINVAL; + } + + crtc =3D item_to_config_crtc(target); + + if (links->linked_object_bitmap & BIT(crtc->crtc_config_idx)) { + DRM_ERROR( + "Tried to add two symlinks to the same CRTC from the same object\n"); + return -EINVAL; + } + + links->linked_object_bitmap |=3D BIT(crtc->crtc_config_idx); + + return 0; +} + +static void possible_crtcs_drop_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_crtc *crtc =3D item_to_config_crtc(target); + + links->linked_object_bitmap &=3D ~BIT(crtc->crtc_config_idx); +} + +static struct configfs_item_operations possible_crtcs_item_ops =3D { + .allow_link =3D &possible_crtcs_allow_link, + .drop_link =3D &possible_crtcs_drop_link, +}; + +static struct config_item_type possible_crtcs_group_type =3D { + .ct_item_ops =3D &possible_crtcs_item_ops, + .ct_owner =3D THIS_MODULE, +}; + +static void add_possible_crtcs(struct config_group *parent, + struct config_group *possible_crtcs) +{ + config_group_init_type_name(possible_crtcs, "possible_crtcs", + &possible_crtcs_group_type); + configfs_add_default_group(possible_crtcs, parent); +} + +/* Possible encoders, e.g. /config/vkms/device/connector/possible_encoders= / */ + +static struct config_item_type encoder_type; + +static int possible_encoders_allow_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_encoder *encoder; + + if (target->ci_type !=3D &encoder_type) { + DRM_ERROR("Unable to link non-encoders.\n"); + return -EINVAL; + } + + encoder =3D item_to_config_encoder(target); + + if (links->linked_object_bitmap & BIT(encoder->encoder_config_idx)) { + DRM_ERROR( + "Tried to add two symlinks to the same encoder from the same object\n"); + return -EINVAL; + } + + links->linked_object_bitmap |=3D BIT(encoder->encoder_config_idx); + + return 0; +} + +static void possible_encoders_drop_link(struct config_item *src, + struct config_item *target) +{ + struct vkms_config_links *links =3D item_to_config_links(src); + struct vkms_config_encoder *encoder =3D item_to_config_encoder(target); + + links->linked_object_bitmap &=3D ~BIT(encoder->encoder_config_idx); +} + +static struct configfs_item_operations possible_encoders_item_ops =3D { + .allow_link =3D &possible_encoders_allow_link, + .drop_link =3D &possible_encoders_drop_link, +}; + +static struct config_item_type possible_encoders_group_type =3D { + .ct_item_ops =3D &possible_encoders_item_ops, + .ct_owner =3D THIS_MODULE, +}; + +static void add_possible_encoders(struct config_group *parent, + struct config_group *possible_encoders) +{ + config_group_init_type_name(possible_encoders, "possible_encoders", + &possible_encoders_group_type); + configfs_add_default_group(possible_encoders, parent); +} + +/* + * Individual objects (connectors, crtcs, encoders, planes): + */ + +/* Connector item, e.g. /config/vkms/device/connectors/ID */ + +static ssize_t connector_connected_show(struct config_item *item, char *bu= f) +{ + struct vkms_config_connector *connector =3D + item_to_config_connector(item); + struct vkms_configfs *configfs =3D connector_item_to_configfs(item); + bool connected =3D false; + + mutex_lock(&configfs->lock); + connected =3D connector->connected; + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%d\n", connected); +} + +static ssize_t connector_connected_store(struct config_item *item, + const char *buf, size_t len) +{ + struct vkms_config_connector *connector =3D + item_to_config_connector(item); + struct vkms_configfs *configfs =3D connector_item_to_configfs(item); + int val, ret; + + ret =3D kstrtouint(buf, 10, &val); + if (ret) + return ret; + + if (val !=3D 1 && val !=3D 0) + return -EINVAL; + + mutex_lock(&configfs->lock); + connector->connected =3D val; + if (!connector->connector) { + pr_info("VKMS Device %s is not yet enabled, connector will be enabled on= start", + configfs->device_group.cg_item.ci_name); + } + mutex_unlock(&configfs->lock); + + if (connector->connector) + drm_kms_helper_hotplug_event(connector->connector->dev); + + return len; +} + +CONFIGFS_ATTR(connector_, connected); + +static struct configfs_attribute *connector_attrs[] =3D { + &connector_attr_connected, + NULL, +}; + +static struct config_item_type connector_type =3D { + .ct_attrs =3D connector_attrs, + .ct_owner =3D THIS_MODULE, +}; + +/* Crtc item, e.g. /config/vkms/device/crtcs/ID */ + +static struct config_item_type crtc_type =3D { + .ct_owner =3D THIS_MODULE, +}; + +/* Encoder item, e.g. /config/vkms/device/encoder/ID */ + +static struct config_item_type encoder_type =3D { + .ct_owner =3D THIS_MODULE, +}; + +/* Plane item, e.g. /config/vkms/device/planes/ID */ + +static ssize_t plane_type_show(struct config_item *item, char *buf) +{ + struct vkms_config_plane *plane =3D item_to_config_plane(item); + struct vkms_configfs *configfs =3D plane_item_to_configfs(item); + enum drm_plane_type plane_type; + + mutex_lock(&configfs->lock); + plane_type =3D plane->type; + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%u\n", plane_type); +} + +static ssize_t plane_type_store(struct config_item *item, const char *buf, + size_t len) +{ + struct vkms_config_plane *plane =3D item_to_config_plane(item); + struct vkms_configfs *configfs =3D plane_item_to_configfs(item); + int val, ret; + + ret =3D kstrtouint(buf, 10, &val); + if (ret) + return ret; + + if (val !=3D DRM_PLANE_TYPE_PRIMARY && val !=3D DRM_PLANE_TYPE_CURSOR && + val !=3D DRM_PLANE_TYPE_OVERLAY) + return -EINVAL; + + mutex_lock(&configfs->lock); + plane->type =3D val; + mutex_unlock(&configfs->lock); + + return len; +} + +CONFIGFS_ATTR(plane_, type); + +static struct configfs_attribute *plane_attrs[] =3D { + &plane_attr_type, + NULL, +}; + +static struct config_item_type plane_type =3D { + .ct_attrs =3D plane_attrs, + .ct_owner =3D THIS_MODULE, +}; + +/* + * Directory groups, e.g. /config/vkms/device/{planes, crtcs, ...} + */ + +/* Connectors group: /config/vkms/device/connectors/ */ + +static struct config_group *connectors_group_make(struct config_group *gro= up, + const char *name) +{ + struct vkms_config_connector *connector =3D + kzalloc(sizeof(*connector), GFP_KERNEL); + if (!connector) + return ERR_PTR(-ENOMEM); + + config_group_init_type_name(&connector->config_group, name, + &connector_type); + add_possible_encoders(&connector->config_group, + &connector->possible_encoders.group); + connector->connected =3D false; + + return &connector->config_group; +} + +static void connectors_group_drop(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_connector *connector =3D + item_to_config_connector(item); + kfree(connector); +} + +static struct configfs_group_operations connectors_group_ops =3D { + .make_group =3D &connectors_group_make, + .drop_item =3D &connectors_group_drop, +}; + +static struct config_item_type connectors_group_type =3D { + .ct_group_ops =3D &connectors_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* CRTCs group: /config/vkms/device/crtcs/ */ + +static struct config_group *crtcs_group_make(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D + container_of(group, struct vkms_configfs, crtcs_group); + unsigned long next_idx; + struct vkms_config_crtc *crtc; + + mutex_lock(&configfs->lock); + + next_idx =3D find_first_zero_bit(&configfs->allocated_crtcs, + VKMS_MAX_OUTPUT_OBJECTS); + + if (next_idx =3D=3D VKMS_MAX_OUTPUT_OBJECTS) { + DRM_ERROR("Unable to allocate another CRTC.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + crtc =3D kzalloc(sizeof(*crtc), GFP_KERNEL); + if (!crtc) { + DRM_ERROR("Unable to allocate CRTC.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + config_group_init_type_name(&crtc->config_group, name, &crtc_type); + crtc->crtc_config_idx =3D next_idx; + + set_bit(next_idx, &configfs->allocated_crtcs); + + mutex_unlock(&configfs->lock); + + return &crtc->config_group; +} + +static void crtcs_group_drop(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_crtc *crtc =3D item_to_config_crtc(item); + kfree(crtc); +} + +static struct configfs_group_operations crtcs_group_ops =3D { + .make_group =3D &crtcs_group_make, + .drop_item =3D &crtcs_group_drop, +}; + +static struct config_item_type crtcs_group_type =3D { + .ct_group_ops =3D &crtcs_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* Encoders group: /config/vkms/device/encoders/ */ + +static struct config_group *encoders_group_make(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D + container_of(group, struct vkms_configfs, encoders_group); + unsigned long next_idx; + struct vkms_config_encoder *encoder; + + mutex_lock(&configfs->lock); + + next_idx =3D find_first_zero_bit(&configfs->allocated_encoders, + VKMS_MAX_OUTPUT_OBJECTS); + + if (next_idx =3D=3D VKMS_MAX_OUTPUT_OBJECTS) { + DRM_ERROR("Unable to allocate another encoder.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + encoder =3D kzalloc(sizeof(*encoder), GFP_KERNEL); + if (!encoder) { + DRM_ERROR("Unable to allocate encoder.\n"); + mutex_unlock(&configfs->lock); + return ERR_PTR(-ENOMEM); + } + + config_group_init_type_name(&encoder->config_group, name, + &encoder_type); + add_possible_crtcs(&encoder->config_group, + &encoder->possible_crtcs.group); + encoder->encoder_config_idx =3D next_idx; + set_bit(next_idx, &configfs->allocated_encoders); + + mutex_unlock(&configfs->lock); + + return &encoder->config_group; +} + +static void encoders_group_drop(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_encoder *encoder =3D item_to_config_encoder(item); + kfree(encoder); +} + +static struct configfs_group_operations encoders_group_ops =3D { + .make_group =3D &encoders_group_make, + .drop_item =3D &encoders_group_drop, +}; + +static struct config_item_type encoders_group_type =3D { + .ct_group_ops =3D &encoders_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* Planes group: /config/vkms/device/planes/ */ + +static struct config_group *make_plane_group(struct config_group *group, + const char *name) +{ + struct vkms_config_plane *plane =3D kzalloc(sizeof(*plane), GFP_KERNEL); + if (!plane) + return ERR_PTR(-ENOMEM); + + config_group_init_type_name(&plane->config_group, name, &plane_type); + add_possible_crtcs(&plane->config_group, &plane->possible_crtcs.group); + + return &plane->config_group; +} + +static void drop_plane_group(struct config_group *group, + struct config_item *item) +{ + struct vkms_config_plane *plane =3D item_to_config_plane(item); + kfree(plane); +} + +static struct configfs_group_operations plane_group_ops =3D { + .make_group =3D &make_plane_group, + .drop_item =3D &drop_plane_group, +}; + +static struct config_item_type planes_group_type =3D { + .ct_group_ops =3D &plane_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +/* Root directory group, e.g. /config/vkms/device */ + +static ssize_t device_enabled_show(struct config_item *item, char *buf) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + bool is_enabled; + + mutex_lock(&configfs->lock); + is_enabled =3D configfs->vkms_device !=3D NULL; + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%d\n", is_enabled); +} + +static ssize_t device_enabled_store(struct config_item *item, const char *= buf, + size_t len) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + struct vkms_device *device; + int enabled, ret; + + ret =3D kstrtoint(buf, 0, &enabled); + if (ret) + return ret; + + 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; + } + + 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); + + return len; + } + + return -EINVAL; +} + +CONFIGFS_ATTR(device_, enabled); + +static ssize_t device_id_show(struct config_item *item, char *buf) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + int id =3D -1; + + mutex_lock(&configfs->lock); + if (configfs->vkms_device) { + id =3D configfs->vkms_device->platform->id; + } + mutex_unlock(&configfs->lock); + + return sprintf(buf, "%d\n", id); +} + +CONFIGFS_ATTR_RO(device_, id); + +static struct configfs_attribute *device_group_attrs[] =3D { + &device_attr_id, + &device_attr_enabled, + NULL, +}; + +static struct config_item_type device_group_type =3D { + .ct_attrs =3D device_group_attrs, + .ct_owner =3D THIS_MODULE, +}; + +static void vkms_configfs_setup_default_groups(struct vkms_configfs *confi= gfs, + const char *name) +{ + config_group_init_type_name(&configfs->device_group, name, + &device_group_type); + + config_group_init_type_name(&configfs->connectors_group, "connectors", + &connectors_group_type); + configfs_add_default_group(&configfs->connectors_group, + &configfs->device_group); + + config_group_init_type_name(&configfs->crtcs_group, "crtcs", + &crtcs_group_type); + configfs_add_default_group(&configfs->crtcs_group, + &configfs->device_group); + + config_group_init_type_name(&configfs->encoders_group, "encoders", + &encoders_group_type); + configfs_add_default_group(&configfs->encoders_group, + &configfs->device_group); + + config_group_init_type_name(&configfs->planes_group, "planes", + &planes_group_type); + configfs_add_default_group(&configfs->planes_group, + &configfs->device_group); +} + +/* Root directory group and subsystem, e.g. /config/vkms/ */ + +static struct config_group *make_root_group(struct config_group *group, + const char *name) +{ + struct vkms_configfs *configfs =3D kzalloc(sizeof(*configfs), GFP_KERNEL); + + if (!configfs) + return ERR_PTR(-ENOMEM); + + vkms_configfs_setup_default_groups(configfs, name); + mutex_init(&configfs->lock); + + return &configfs->device_group; +} + +static void drop_root_group(struct config_group *group, + struct config_item *item) +{ + struct vkms_configfs *configfs =3D item_to_configfs(item); + + mutex_lock(&configfs->lock); + if (configfs->vkms_device) + vkms_remove_device(configfs->vkms_device); + mutex_unlock(&configfs->lock); + + kfree(configfs); +} + +static struct configfs_group_operations root_group_ops =3D { + .make_group =3D &make_root_group, + .drop_item =3D &drop_root_group, +}; + +static struct config_item_type vkms_type =3D { + .ct_group_ops =3D &root_group_ops, + .ct_owner =3D THIS_MODULE, +}; + +static struct configfs_subsystem vkms_subsys =3D { + .su_group =3D { + .cg_item =3D { + .ci_name =3D "vkms", + .ci_type =3D &vkms_type, + }, + }, + .su_mutex =3D __MUTEX_INITIALIZER(vkms_subsys.su_mutex), +}; + +int vkms_init_configfs(void) +{ + config_group_init(&vkms_subsys.su_group); + return configfs_register_subsystem(&vkms_subsys); +} + +void vkms_unregister_configfs(void) +{ + configfs_unregister_subsystem(&vkms_subsys); +} diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_c= rtc.c index 57bbd32e9beb..5ebb5264f6ef 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -11,35 +11,34 @@ =20 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) { - struct vkms_output *output =3D container_of(timer, struct vkms_output, - vblank_hrtimer); - struct drm_crtc *crtc =3D &output->crtc; + struct vkms_crtc *vkms_crtc =3D timer_to_vkms_crtc(timer); + struct drm_crtc *crtc =3D &vkms_crtc->base; struct vkms_crtc_state *state; u64 ret_overrun; bool ret, fence_cookie; =20 fence_cookie =3D dma_fence_begin_signalling(); =20 - ret_overrun =3D hrtimer_forward_now(&output->vblank_hrtimer, - output->period_ns); + ret_overrun =3D hrtimer_forward_now(&vkms_crtc->vblank_hrtimer, + vkms_crtc->period_ns); if (ret_overrun !=3D 1) pr_warn("%s: vblank timer overrun\n", __func__); =20 - spin_lock(&output->lock); + spin_lock(&vkms_crtc->lock); ret =3D drm_crtc_handle_vblank(crtc); if (!ret) DRM_ERROR("vkms failure on handling vblank"); =20 - state =3D output->composer_state; - spin_unlock(&output->lock); + state =3D vkms_crtc->composer_state; + spin_unlock(&vkms_crtc->lock); =20 - if (state && output->composer_enabled) { + if (state && vkms_crtc->composer_enabled) { u64 frame =3D drm_crtc_accurate_vblank_count(crtc); =20 /* update frame_start only if a queued vkms_composer_worker() * has read the data */ - spin_lock(&output->composer_lock); + spin_lock(&vkms_crtc->composer_lock); if (!state->crc_pending) state->frame_start =3D frame; else @@ -47,9 +46,10 @@ static enum hrtimer_restart vkms_vblank_simulate(struct = hrtimer *timer) state->frame_start, frame); state->frame_end =3D frame; state->crc_pending =3D true; - spin_unlock(&output->composer_lock); + spin_unlock(&vkms_crtc->composer_lock); =20 - ret =3D queue_work(output->composer_workq, &state->composer_work); + ret =3D queue_work(vkms_crtc->composer_workq, + &state->composer_work); if (!ret) DRM_DEBUG_DRIVER("Composer worker already queued\n"); } @@ -62,25 +62,27 @@ static enum hrtimer_restart vkms_vblank_simulate(struct= hrtimer *timer) static int vkms_enable_vblank(struct drm_crtc *crtc) { struct drm_device *dev =3D crtc->dev; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); unsigned int pipe =3D drm_crtc_index(crtc); struct drm_vblank_crtc *vblank =3D &dev->vblank[pipe]; - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); =20 drm_calc_timestamping_constants(crtc, &crtc->mode); =20 - hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - out->vblank_hrtimer.function =3D &vkms_vblank_simulate; - out->period_ns =3D ktime_set(0, vblank->framedur_ns); - hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL); + hrtimer_init(&vkms_crtc->vblank_hrtimer, CLOCK_MONOTONIC, + HRTIMER_MODE_REL); + vkms_crtc->vblank_hrtimer.function =3D &vkms_vblank_simulate; + vkms_crtc->period_ns =3D ktime_set(0, vblank->framedur_ns); + hrtimer_start(&vkms_crtc->vblank_hrtimer, vkms_crtc->period_ns, + HRTIMER_MODE_REL); =20 return 0; } =20 static void vkms_disable_vblank(struct drm_crtc *crtc) { - struct vkms_output *out =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 - hrtimer_cancel(&out->vblank_hrtimer); + hrtimer_cancel(&vkms_crtc->vblank_hrtimer); } =20 static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc, @@ -88,9 +90,8 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, bool in_vblank_irq) { struct drm_device *dev =3D crtc->dev; + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); unsigned int pipe =3D crtc->index; - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); - struct vkms_output *output =3D &vkmsdev->output; struct drm_vblank_crtc *vblank =3D &dev->vblank[pipe]; =20 if (!READ_ONCE(vblank->enabled)) { @@ -98,7 +99,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *cr= tc, return true; } =20 - *vblank_time =3D READ_ONCE(output->vblank_hrtimer.node.expires); + *vblank_time =3D READ_ONCE(vkms_crtc->vblank_hrtimer.node.expires); =20 if (WARN_ON(*vblank_time =3D=3D vblank->time)) return true; @@ -110,7 +111,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *= crtc, * the vblank core expects. Therefore we need to always correct the * timestampe by one frame. */ - *vblank_time -=3D output->period_ns; + *vblank_time -=3D vkms_crtc->period_ns; =20 return true; } @@ -161,7 +162,6 @@ static void vkms_atomic_crtc_reset(struct drm_crtc *crt= c) =20 static const struct drm_crtc_funcs vkms_crtc_funcs =3D { .set_config =3D drm_atomic_helper_set_config, - .destroy =3D drm_crtc_cleanup, .page_flip =3D drm_atomic_helper_page_flip, .reset =3D vkms_atomic_crtc_reset, .atomic_duplicate_state =3D vkms_atomic_crtc_duplicate_state, @@ -237,18 +237,18 @@ static void vkms_crtc_atomic_disable(struct drm_crtc = *crtc, static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 /* This lock is held across the atomic commit to block vblank timer * from scheduling vkms_composer_worker until the composer is updated */ - spin_lock_irq(&vkms_output->lock); + spin_lock_irq(&vkms_crtc->lock); } =20 static void vkms_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct vkms_output *vkms_output =3D drm_crtc_to_vkms_output(crtc); + struct vkms_crtc *vkms_crtc =3D drm_crtc_to_vkms_crtc(crtc); =20 if (crtc->state->event) { spin_lock(&crtc->dev->event_lock); @@ -263,9 +263,9 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crt= c, crtc->state->event =3D NULL; } =20 - vkms_output->composer_state =3D to_vkms_crtc_state(crtc->state); + vkms_crtc->composer_state =3D to_vkms_crtc_state(crtc->state); =20 - spin_unlock_irq(&vkms_output->lock); + spin_unlock_irq(&vkms_crtc->lock); } =20 static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs =3D { @@ -276,27 +276,41 @@ static const struct drm_crtc_helper_funcs vkms_crtc_h= elper_funcs =3D { .atomic_disable =3D vkms_crtc_atomic_disable, }; =20 -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor) +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, + struct drm_plane *primary, + struct drm_plane *cursor, const char *name) { - struct vkms_output *vkms_out =3D drm_crtc_to_vkms_output(crtc); + struct drm_device *dev =3D &vkmsdev->drm; + struct vkms_crtc *vkms_crtc; int ret; =20 - ret =3D drm_crtc_init_with_planes(dev, crtc, primary, cursor, - &vkms_crtc_funcs, NULL); + if (vkmsdev->output.num_crtcs >=3D VKMS_MAX_OUTPUT_OBJECTS) { + return ERR_PTR(-ENOMEM); + } + vkms_crtc =3D &vkmsdev->output.crtcs[vkmsdev->output.num_crtcs++]; + + ret =3D drmm_crtc_init_with_planes(dev, &vkms_crtc->base, primary, cursor, + &vkms_crtc_funcs, name); if (ret) { DRM_ERROR("Failed to init CRTC\n"); - return ret; + goto out_error; } =20 - drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs); + drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs); =20 - spin_lock_init(&vkms_out->lock); - spin_lock_init(&vkms_out->composer_lock); + spin_lock_init(&vkms_crtc->lock); + spin_lock_init(&vkms_crtc->composer_lock); =20 - vkms_out->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); - if (!vkms_out->composer_workq) - return -ENOMEM; + vkms_crtc->composer_workq =3D alloc_ordered_workqueue("vkms_composer", 0); + if (!vkms_crtc->composer_workq) { + ret =3D -ENOMEM; + goto out_error; + } + + return vkms_crtc; =20 - return ret; +out_error: + memset(vkms_crtc, 0, sizeof(*vkms_crtc)); + vkmsdev->output.num_crtcs -=3D 1; + return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_dr= v.c index 69346906ec81..7e1ec7d89dcb 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -9,10 +9,15 @@ * the GPU in DRM API tests. */ =20 +#include +#include +#include +#include #include #include #include =20 +#include #include #include #include @@ -37,19 +42,26 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 =20 -static struct vkms_config *default_config; +static bool enable_default_device =3D true; +module_param_named(enable_default_device, enable_default_device, bool, 044= 4); +MODULE_PARM_DESC(enable_default_device, + "Enable/Disable creating the default device"); =20 static bool enable_cursor =3D true; module_param_named(enable_cursor, enable_cursor, bool, 0444); -MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); +MODULE_PARM_DESC(enable_cursor, + "Enable/Disable cursor support for the default device"); =20 static bool enable_writeback =3D true; module_param_named(enable_writeback, enable_writeback, bool, 0444); -MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector sup= port"); +MODULE_PARM_DESC( + enable_writeback, + "Enable/Disable writeback connector support for the default device"); =20 static bool enable_overlay; module_param_named(enable_overlay, enable_overlay, bool, 0444); -MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support"); +MODULE_PARM_DESC(enable_overlay, + "Enable/Disable overlay support for the default device"); =20 DEFINE_DRM_GEM_FOPS(vkms_driver_fops); =20 @@ -57,8 +69,8 @@ static void vkms_release(struct drm_device *dev) { struct vkms_device *vkms =3D drm_device_to_vkms_device(dev); =20 - if (vkms->output.composer_workq) - destroy_workqueue(vkms->output.composer_workq); + for (int i =3D 0; i < vkms->output.num_crtcs; i++) + destroy_workqueue(vkms->output.crtcs[i].composer_workq); } =20 static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state) @@ -90,37 +102,12 @@ static void vkms_atomic_commit_tail(struct drm_atomic_= state *old_state) drm_atomic_helper_cleanup_planes(dev, old_state); } =20 -static int vkms_config_show(struct seq_file *m, void *data) -{ - struct drm_info_node *node =3D (struct drm_info_node *)m->private; - struct drm_device *dev =3D node->minor->dev; - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(dev); - - seq_printf(m, "writeback=3D%d\n", vkmsdev->config->writeback); - seq_printf(m, "cursor=3D%d\n", vkmsdev->config->cursor); - seq_printf(m, "overlay=3D%d\n", vkmsdev->config->overlay); - - return 0; -} - -static const struct drm_info_list vkms_config_debugfs_list[] =3D { - { "vkms_config", vkms_config_show, 0 }, -}; - -static void vkms_config_debugfs_init(struct drm_minor *minor) -{ - drm_debugfs_create_files(vkms_config_debugfs_list, ARRAY_SIZE(vkms_config= _debugfs_list), - minor->debugfs_root, minor); -} - static const struct drm_driver vkms_driver =3D { .driver_features =3D DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM, .release =3D vkms_release, .fops =3D &vkms_driver_fops, DRM_GEM_SHMEM_DRIVER_OPS, =20 - .debugfs_init =3D vkms_config_debugfs_init, - .name =3D DRIVER_NAME, .desc =3D DRIVER_DESC, .date =3D DRIVER_DATE, @@ -141,8 +128,12 @@ static const struct drm_mode_config_helper_funcs vkms_= mode_config_helpers =3D { static int vkms_modeset_init(struct vkms_device *vkmsdev) { struct drm_device *dev =3D &vkmsdev->drm; + int ret; + + ret =3D drmm_mode_config_init(dev); + if (ret) + return ret; =20 - drm_mode_config_init(dev); dev->mode_config.funcs =3D &vkms_mode_funcs; dev->mode_config.min_width =3D XRES_MIN; dev->mode_config.min_height =3D YRES_MIN; @@ -156,114 +147,176 @@ static int vkms_modeset_init(struct vkms_device *vk= msdev) dev->mode_config.preferred_depth =3D 0; dev->mode_config.helper_private =3D &vkms_mode_config_helpers; =20 - return vkms_output_init(vkmsdev, 0); + return vkmsdev->configfs ? vkms_output_init(vkmsdev) : + vkms_output_init_default(vkmsdev); } =20 -static int vkms_create(struct vkms_config *config) +static int vkms_platform_probe(struct platform_device *pdev) { int ret; - struct platform_device *pdev; + struct vkms_device_setup *vkms_device_setup =3D pdev->dev.platform_data; struct vkms_device *vkms_device; + void *grp; =20 - pdev =3D platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); - - if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) { - ret =3D -ENOMEM; - goto out_unregister; + grp =3D devres_open_group(&pdev->dev, NULL, GFP_KERNEL); + if (!grp) { + DRM_ERROR("Could not open devres group\n"); + return -ENOMEM; } =20 vkms_device =3D devm_drm_dev_alloc(&pdev->dev, &vkms_driver, struct vkms_device, drm); if (IS_ERR(vkms_device)) { ret =3D PTR_ERR(vkms_device); - goto out_devres; + goto out_release_group; } + vkms_device->platform =3D pdev; - vkms_device->config =3D config; - config->dev =3D vkms_device; + vkms_device->config.cursor =3D enable_cursor; + vkms_device->config.writeback =3D enable_writeback; + vkms_device->config.overlay =3D enable_overlay; + vkms_device->configfs =3D vkms_device_setup->configfs; =20 ret =3D dma_coerce_mask_and_coherent(vkms_device->drm.dev, DMA_BIT_MASK(64)); - if (ret) { DRM_ERROR("Could not initialize DMA support\n"); - goto out_devres; + goto out_release_group; } =20 - ret =3D drm_vblank_init(&vkms_device->drm, 1); + ret =3D vkms_modeset_init(vkms_device); if (ret) { - DRM_ERROR("Failed to vblank\n"); - goto out_devres; + DRM_ERROR("Unable to initialize modesetting\n"); + goto out_release_group; } =20 - ret =3D vkms_modeset_init(vkms_device); - if (ret) - goto out_devres; + ret =3D drm_vblank_init(&vkms_device->drm, vkms_device->output.num_crtcs); + if (ret) { + DRM_ERROR("Failed to vblank\n"); + goto out_release_group; + } =20 ret =3D drm_dev_register(&vkms_device->drm, 0); - if (ret) - goto out_devres; + if (ret) { + DRM_ERROR("Unable to register device with id %d\n", pdev->id); + goto out_release_group; + } =20 drm_fbdev_generic_setup(&vkms_device->drm, 0); + platform_set_drvdata(pdev, vkms_device); + devres_close_group(&pdev->dev, grp); =20 return 0; =20 -out_devres: - devres_release_group(&pdev->dev, NULL); -out_unregister: - platform_device_unregister(pdev); +out_release_group: + devres_release_group(&pdev->dev, grp); return ret; } =20 -static int __init vkms_init(void) +static int vkms_platform_remove(struct platform_device *pdev) { - int ret; - struct vkms_config *config; + struct vkms_device *vkms_device; =20 - config =3D kmalloc(sizeof(*config), GFP_KERNEL); - if (!config) - return -ENOMEM; + vkms_device =3D platform_get_drvdata(pdev); + if (!vkms_device) + return 0; =20 - default_config =3D config; + drm_dev_unregister(&vkms_device->drm); + drm_atomic_helper_shutdown(&vkms_device->drm); + return 0; +} =20 - config->cursor =3D enable_cursor; - config->writeback =3D enable_writeback; - config->overlay =3D enable_overlay; +static struct platform_driver vkms_platform_driver =3D { + .probe =3D vkms_platform_probe, + .remove =3D vkms_platform_remove, + .driver.name =3D DRIVER_NAME, +}; =20 - ret =3D vkms_create(config); - if (ret) - kfree(config); +struct vkms_device *vkms_add_device(struct vkms_configfs *configfs) +{ + struct device *dev =3D NULL; + struct platform_device *pdev; + int max_id =3D 1; + struct vkms_device_setup vkms_device_setup =3D { + .configfs =3D configfs, + }; + + while ((dev =3D platform_find_device_by_driver( + dev, &vkms_platform_driver.driver))) { + pdev =3D to_platform_device(dev); + max_id =3D max(max_id, pdev->id); + put_device(dev); + } =20 - return ret; + pdev =3D platform_device_register_data(NULL, DRIVER_NAME, max_id + 1, + &vkms_device_setup, + sizeof(vkms_device_setup)); + if (IS_ERR(pdev)) { + DRM_ERROR("Unable to register vkms device'\n"); + return ERR_PTR(PTR_ERR(pdev)); + } + + return platform_get_drvdata(pdev); } =20 -static void vkms_destroy(struct vkms_config *config) +void vkms_remove_device(struct vkms_device *vkms_device) { - struct platform_device *pdev; + platform_device_unregister(vkms_device->platform); +} + +static int __init vkms_init(void) +{ + int ret; + struct platform_device *default_pdev =3D NULL; =20 - if (!config->dev) { - DRM_INFO("vkms_device is NULL.\n"); - return; + ret =3D platform_driver_register(&vkms_platform_driver); + if (ret) { + DRM_ERROR("Unable to register platform driver\n"); + return ret; } =20 - pdev =3D config->dev->platform; + if (enable_default_device) { + struct vkms_device_setup vkms_device_setup =3D { + .configfs =3D NULL, + }; + + default_pdev =3D platform_device_register_data( + NULL, DRIVER_NAME, 0, &vkms_device_setup, + sizeof(vkms_device_setup)); + if (IS_ERR(default_pdev)) { + DRM_ERROR("Unable to register default vkms device\n"); + platform_driver_unregister(&vkms_platform_driver); + return PTR_ERR(default_pdev); + } + } =20 - drm_dev_unregister(&config->dev->drm); - drm_atomic_helper_shutdown(&config->dev->drm); - devres_release_group(&pdev->dev, NULL); - platform_device_unregister(pdev); + ret =3D vkms_init_configfs(); + if (ret) { + DRM_ERROR("Unable to initialize configfs\n"); + if (default_pdev) + platform_device_unregister(default_pdev); + + platform_driver_unregister(&vkms_platform_driver); + } =20 - config->dev =3D NULL; + return 0; } =20 static void __exit vkms_exit(void) { - if (default_config->dev) - vkms_destroy(default_config); + struct device *dev; + + vkms_unregister_configfs(); + + while ((dev =3D platform_find_device_by_driver( + NULL, &vkms_platform_driver.driver))) { + // platform_find_device_by_driver increments the refcount. Drop + // it so we don't leak memory. + put_device(dev); + platform_device_unregister(to_platform_device(dev)); + } =20 - kfree(default_config); + platform_driver_unregister(&vkms_platform_driver); } =20 module_init(vkms_init); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_dr= v.h index 0a67b8073f7e..7b9b189511c2 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -3,6 +3,8 @@ #ifndef _VKMS_DRV_H_ #define _VKMS_DRV_H_ =20 +#include "drm/drm_connector.h" +#include #include =20 #include @@ -10,10 +12,11 @@ #include #include #include +#include #include =20 -#define XRES_MIN 20 -#define YRES_MIN 20 +#define XRES_MIN 10 +#define YRES_MIN 10 =20 #define XRES_DEF 1024 #define YRES_DEF 768 @@ -23,10 +26,15 @@ =20 #define NUM_OVERLAY_PLANES 8 =20 +#define VKMS_MAX_OUTPUT_OBJECTS 16 +#define VKMS_MAX_PLANES (3 * VKMS_MAX_OUTPUT_OBJECTS) + struct vkms_frame_info { struct drm_framebuffer *fb; struct drm_rect src, dst; + struct drm_rect rotated; struct iosys_map map[DRM_FORMAT_MAX_PLANES]; + unsigned int rotation; unsigned int offset; unsigned int pitch; unsigned int cpp; @@ -44,8 +52,7 @@ struct line_buffer { struct vkms_writeback_job { struct iosys_map data[DRM_FORMAT_MAX_PLANES]; struct vkms_frame_info wb_frame_info; - void (*wb_write)(struct vkms_frame_info *frame_info, - const struct line_buffer *buffer, int y); + void (*pixel_write)(u8 *dst_pixels, struct pixel_argb_u16 *in_pixel); }; =20 /** @@ -56,14 +63,32 @@ struct vkms_writeback_job { struct vkms_plane_state { struct drm_shadow_plane_state base; struct vkms_frame_info *frame_info; - void (*plane_read)(struct line_buffer *buffer, - const struct vkms_frame_info *frame_info, int y); + void (*pixel_read)(u8 *src_buffer, struct pixel_argb_u16 *out_pixel); }; =20 struct vkms_plane { struct drm_plane base; }; =20 +struct vkms_crtc { + struct drm_crtc base; + + struct drm_writeback_connector wb_connector; + struct hrtimer vblank_hrtimer; + ktime_t period_ns; + struct drm_pending_vblank_event *event; + /* ordered wq for composer_work */ + struct workqueue_struct *composer_workq; + /* protects concurrent access to composer */ + spinlock_t lock; + + /* protected by @lock */ + bool composer_enabled; + struct vkms_crtc_state *composer_state; + + spinlock_t composer_lock; +}; + /** * vkms_crtc_state - Driver specific CRTC state * @base: base CRTC state @@ -88,62 +113,145 @@ struct vkms_crtc_state { }; =20 struct vkms_output { - struct drm_crtc crtc; - struct drm_encoder encoder; - struct drm_connector connector; - struct drm_writeback_connector wb_connector; - struct hrtimer vblank_hrtimer; - ktime_t period_ns; - struct drm_pending_vblank_event *event; - /* ordered wq for composer_work */ - struct workqueue_struct *composer_workq; - /* protects concurrent access to composer */ - spinlock_t lock; - - /* protected by @lock */ - bool composer_enabled; - struct vkms_crtc_state *composer_state; - - spinlock_t composer_lock; + int num_crtcs; + struct vkms_crtc crtcs[VKMS_MAX_OUTPUT_OBJECTS]; + int num_encoders; + struct drm_encoder encoders[VKMS_MAX_OUTPUT_OBJECTS]; + int num_connectors; + struct drm_connector connectors[VKMS_MAX_OUTPUT_OBJECTS]; + int num_planes; + struct vkms_plane planes[VKMS_MAX_PLANES]; }; =20 -struct vkms_device; - struct vkms_config { bool writeback; bool cursor; bool overlay; - /* only set when instantiated */ - struct vkms_device *dev; +}; + +struct vkms_config_links { + struct config_group group; + unsigned long linked_object_bitmap; +}; + +struct vkms_config_connector { + struct config_group config_group; + struct drm_connector *connector; + struct vkms_config_links possible_encoders; + bool connected; +}; + +struct vkms_config_crtc { + struct config_group config_group; + unsigned long crtc_config_idx; +}; + +struct vkms_config_encoder { + struct config_group config_group; + struct vkms_config_links possible_crtcs; + unsigned long encoder_config_idx; +}; + +struct vkms_config_plane { + struct vkms_configfs *configfs; + struct config_group config_group; + struct vkms_config_links possible_crtcs; + enum drm_plane_type type; +}; + +struct vkms_configfs { + /* Directory group containing connector configs, e.g. /config/vkms/device= / */ + struct config_group device_group; + /* Directory group containing connector configs, e.g. /config/vkms/device= /connectors/ */ + struct config_group connectors_group; + /* Directory group containing CRTC configs, e.g. /config/vkms/device/crtc= s/ */ + struct config_group crtcs_group; + /* Directory group containing encoder configs, e.g. /config/vkms/device/e= ncoders/ */ + struct config_group encoders_group; + /* Directory group containing plane configs, e.g. /config/vkms/device/pla= nes/ */ + struct config_group planes_group; + + unsigned long allocated_crtcs; + unsigned long allocated_encoders; + + struct mutex lock; + + /* The platform device if this is registered, otherwise NULL */ + struct vkms_device *vkms_device; +}; + +struct vkms_device_setup { + // Is NULL in the case of the default card. + struct vkms_configfs *configfs; }; =20 struct vkms_device { struct drm_device drm; struct platform_device *platform; + // Is NULL in the case of the default card. + struct vkms_configfs *configfs; struct vkms_output output; - const struct vkms_config *config; + struct vkms_config config; }; =20 -#define drm_crtc_to_vkms_output(target) \ - container_of(target, struct vkms_output, crtc) +#define drm_crtc_to_vkms_crtc(crtc) container_of(crtc, struct vkms_crtc, b= ase) =20 #define drm_device_to_vkms_device(target) \ container_of(target, struct vkms_device, drm) =20 +#define timer_to_vkms_crtc(timer) \ + container_of(timer, struct vkms_crtc, vblank_hrtimer) + #define to_vkms_crtc_state(target)\ container_of(target, struct vkms_crtc_state, base) =20 #define to_vkms_plane_state(target)\ container_of(target, struct vkms_plane_state, base.base) =20 +#define item_to_configfs(item) \ + container_of(to_config_group(item), struct vkms_configfs, device_group) + +#define connector_item_to_configfs(item) = \ + container_of(to_config_group(item->ci_parent), struct vkms_configfs, \ + connectors_group) + +#define item_to_config_connector(item) \ + container_of(to_config_group(item), struct vkms_config_connector, \ + config_group) + +#define item_to_config_crtc(item) \ + container_of(to_config_group(item), struct vkms_config_crtc, \ + config_group) + +#define item_to_config_encoder(item) \ + container_of(to_config_group(item), struct vkms_config_encoder, \ + config_group) + +#define item_to_config_plane(item) \ + container_of(to_config_group(item), struct vkms_config_plane, \ + config_group) + +#define item_to_config_links(item) \ + container_of(to_config_group(item), struct vkms_config_links, group) + +#define plane_item_to_configfs(item) = \ + container_of(to_config_group(item->ci_parent), struct vkms_configfs, \ + planes_group) + +/* Devices */ +struct vkms_device *vkms_add_device(struct vkms_configfs *configfs); +void vkms_remove_device(struct vkms_device *vkms_device); + /* CRTC */ -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *primary, struct drm_plane *cursor); +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev, + struct drm_plane *primary, + struct drm_plane *cursor, const char *name); =20 -int vkms_output_init(struct vkms_device *vkmsdev, int index); +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, int index); + enum drm_plane_type type); =20 /* CRC Support */ const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, @@ -154,9 +262,20 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, cons= t char *source_name, =20 /* Composer Support */ void vkms_composer_worker(struct work_struct *work); -void vkms_set_composer(struct vkms_output *out, bool enabled); +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled); +void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y); +void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_b= uffer *src_buffer, int y); =20 /* Writeback */ -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev); +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, + struct vkms_crtc *vkms_crtc); + +/* ConfigFS Support */ +int vkms_init_configfs(void); +void vkms_unregister_configfs(void); + +/* Connector hotplugging */ +enum drm_connector_status vkms_connector_detect(struct drm_connector *conn= ector, + bool force); =20 #endif /* _VKMS_DRV_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkm= s_formats.c index d4950688b3f1..36046b12f296 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -2,6 +2,8 @@ =20 #include #include + +#include #include #include =20 @@ -37,104 +39,106 @@ static void *packed_pixels_addr(const struct vkms_fra= me_info *frame_info, static void *get_packed_src_addr(const struct vkms_frame_info *frame_info,= int y) { int x_src =3D frame_info->src.x1 >> 16; - int y_src =3D y - frame_info->dst.y1 + (frame_info->src.y1 >> 16); + int y_src =3D y - frame_info->rotated.y1 + (frame_info->src.y1 >> 16); =20 return packed_pixels_addr(frame_info, x_src, y_src); } =20 -static void ARGB8888_to_argb_u16(struct line_buffer *stage_buffer, - const struct vkms_frame_info *frame_info, int y) +static int get_x_position(const struct vkms_frame_info *frame_info, int li= mit, int x) { - struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; - u8 *src_pixels =3D get_packed_src_addr(frame_info, y); - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - stage_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, src_pixels +=3D 4) { - /* - * The 257 is the "conversion ratio". This number is obtained by the - * (2^16 - 1) / (2^8 - 1) division. Which, in this case, tries to get - * the best color value in a pixel format with more possibilities. - * A similar idea applies to others RGB color conversions. - */ - out_pixels[x].a =3D (u16)src_pixels[3] * 257; - out_pixels[x].r =3D (u16)src_pixels[2] * 257; - out_pixels[x].g =3D (u16)src_pixels[1] * 257; - out_pixels[x].b =3D (u16)src_pixels[0] * 257; - } + if (frame_info->rotation & (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_270)) + return limit - x - 1; + return x; } =20 -static void XRGB8888_to_argb_u16(struct line_buffer *stage_buffer, - const struct vkms_frame_info *frame_info, int y) +static void ARGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *ou= t_pixel) { - struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; - u8 *src_pixels =3D get_packed_src_addr(frame_info, y); - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - stage_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, src_pixels +=3D 4) { - out_pixels[x].a =3D (u16)0xffff; - out_pixels[x].r =3D (u16)src_pixels[2] * 257; - out_pixels[x].g =3D (u16)src_pixels[1] * 257; - out_pixels[x].b =3D (u16)src_pixels[0] * 257; - } + /* + * The 257 is the "conversion ratio". This number is obtained by the + * (2^16 - 1) / (2^8 - 1) division. Which, in this case, tries to get + * the best color value in a pixel format with more possibilities. + * A similar idea applies to others RGB color conversions. + */ + out_pixel->a =3D (u16)src_pixels[3] * 257; + out_pixel->r =3D (u16)src_pixels[2] * 257; + out_pixel->g =3D (u16)src_pixels[1] * 257; + out_pixel->b =3D (u16)src_pixels[0] * 257; } =20 -static void ARGB16161616_to_argb_u16(struct line_buffer *stage_buffer, - const struct vkms_frame_info *frame_info, - int y) +static void XRGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *ou= t_pixel) { - struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; - u16 *src_pixels =3D get_packed_src_addr(frame_info, y); - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - stage_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, src_pixels +=3D 4) { - out_pixels[x].a =3D le16_to_cpu(src_pixels[3]); - out_pixels[x].r =3D le16_to_cpu(src_pixels[2]); - out_pixels[x].g =3D le16_to_cpu(src_pixels[1]); - out_pixels[x].b =3D le16_to_cpu(src_pixels[0]); - } + out_pixel->a =3D (u16)0xffff; + out_pixel->r =3D (u16)src_pixels[2] * 257; + out_pixel->g =3D (u16)src_pixels[1] * 257; + out_pixel->b =3D (u16)src_pixels[0] * 257; } =20 -static void XRGB16161616_to_argb_u16(struct line_buffer *stage_buffer, - const struct vkms_frame_info *frame_info, - int y) +static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16= *out_pixel) { - struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; - u16 *src_pixels =3D get_packed_src_addr(frame_info, y); - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - stage_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, src_pixels +=3D 4) { - out_pixels[x].a =3D (u16)0xffff; - out_pixels[x].r =3D le16_to_cpu(src_pixels[2]); - out_pixels[x].g =3D le16_to_cpu(src_pixels[1]); - out_pixels[x].b =3D le16_to_cpu(src_pixels[0]); - } + u16 *pixels =3D (u16 *)src_pixels; + + out_pixel->a =3D le16_to_cpu(pixels[3]); + out_pixel->r =3D le16_to_cpu(pixels[2]); + out_pixel->g =3D le16_to_cpu(pixels[1]); + out_pixel->b =3D le16_to_cpu(pixels[0]); } =20 -static void RGB565_to_argb_u16(struct line_buffer *stage_buffer, - const struct vkms_frame_info *frame_info, int y) +static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16= *out_pixel) { - struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; - u16 *src_pixels =3D get_packed_src_addr(frame_info, y); - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - stage_buffer->n_pixels); + u16 *pixels =3D (u16 *)src_pixels; + + out_pixel->a =3D (u16)0xffff; + out_pixel->r =3D le16_to_cpu(pixels[2]); + out_pixel->g =3D le16_to_cpu(pixels[1]); + out_pixel->b =3D le16_to_cpu(pixels[0]); +} + +static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_= pixel) +{ + u16 *pixels =3D (u16 *)src_pixels; =20 s64 fp_rb_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(31)); s64 fp_g_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(63)); =20 - for (size_t x =3D 0; x < x_limit; x++, src_pixels++) { - u16 rgb_565 =3D le16_to_cpu(*src_pixels); - s64 fp_r =3D drm_int2fixp((rgb_565 >> 11) & 0x1f); - s64 fp_g =3D drm_int2fixp((rgb_565 >> 5) & 0x3f); - s64 fp_b =3D drm_int2fixp(rgb_565 & 0x1f); + u16 rgb_565 =3D le16_to_cpu(*pixels); + s64 fp_r =3D drm_int2fixp((rgb_565 >> 11) & 0x1f); + s64 fp_g =3D drm_int2fixp((rgb_565 >> 5) & 0x3f); + s64 fp_b =3D drm_int2fixp(rgb_565 & 0x1f); + + out_pixel->a =3D (u16)0xffff; + out_pixel->r =3D drm_fixp2int_round(drm_fixp_mul(fp_r, fp_rb_ratio)); + out_pixel->g =3D drm_fixp2int_round(drm_fixp_mul(fp_g, fp_g_ratio)); + out_pixel->b =3D drm_fixp2int_round(drm_fixp_mul(fp_b, fp_rb_ratio)); +} + +/** + * vkms_compose_row - compose a single row of a plane + * @stage_buffer: output line with the composed pixels + * @plane: state of the plane that is being composed + * @y: y coordinate of the row + * + * This function composes a single row of a plane. It gets the source pixe= ls + * through the y coordinate (see get_packed_src_addr()) and goes linearly + * through the source pixel, reading the pixels and converting it to + * ARGB16161616 (see the pixel_read() callback). For rotate-90 and rotate-= 270, + * the source pixels are not traversed linearly. The source pixels are que= ried + * on each iteration in order to traverse the pixels vertically. + */ +void vkms_compose_row(struct line_buffer *stage_buffer, struct vkms_plane_= state *plane, int y) +{ + struct pixel_argb_u16 *out_pixels =3D stage_buffer->pixels; + struct vkms_frame_info *frame_info =3D plane->frame_info; + u8 *src_pixels =3D get_packed_src_addr(frame_info, y); + int limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), stage_buffe= r->n_pixels); + + for (size_t x =3D 0; x < limit; x++, src_pixels +=3D frame_info->cpp) { + int x_pos =3D get_x_position(frame_info, limit, x); + + if (drm_rotation_90_or_270(frame_info->rotation)) + src_pixels =3D get_packed_src_addr(frame_info, x + frame_info->rotated.= y1) + + frame_info->cpp * y; =20 - out_pixels[x].a =3D (u16)0xffff; - out_pixels[x].r =3D drm_fixp2int(drm_fixp_mul(fp_r, fp_rb_ratio)); - out_pixels[x].g =3D drm_fixp2int(drm_fixp_mul(fp_g, fp_g_ratio)); - out_pixels[x].b =3D drm_fixp2int(drm_fixp_mul(fp_b, fp_rb_ratio)); + plane->pixel_read(src_pixels, &out_pixels[x_pos]); } } =20 @@ -146,110 +150,84 @@ static void RGB565_to_argb_u16(struct line_buffer *s= tage_buffer, * They are used in the `compose_active_planes` to convert and store a line * from the src_buffer to the writeback buffer. */ -static void argb_u16_to_ARGB8888(struct vkms_frame_info *frame_info, - const struct line_buffer *src_buffer, int y) +static void argb_u16_to_ARGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in= _pixel) { - int x_dst =3D frame_info->dst.x1; - u8 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); - struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - src_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D 4) { - /* - * This sequence below is important because the format's byte order is - * in little-endian. In the case of the ARGB8888 the memory is - * organized this way: - * - * | Addr | =3D blue channel - * | Addr + 1 | =3D green channel - * | Addr + 2 | =3D Red channel - * | Addr + 3 | =3D Alpha channel - */ - dst_pixels[3] =3D DIV_ROUND_CLOSEST(in_pixels[x].a, 257); - dst_pixels[2] =3D DIV_ROUND_CLOSEST(in_pixels[x].r, 257); - dst_pixels[1] =3D DIV_ROUND_CLOSEST(in_pixels[x].g, 257); - dst_pixels[0] =3D DIV_ROUND_CLOSEST(in_pixels[x].b, 257); - } + /* + * This sequence below is important because the format's byte order is + * in little-endian. In the case of the ARGB8888 the memory is + * organized this way: + * + * | Addr | =3D blue channel + * | Addr + 1 | =3D green channel + * | Addr + 2 | =3D Red channel + * | Addr + 3 | =3D Alpha channel + */ + dst_pixels[3] =3D DIV_ROUND_CLOSEST(in_pixel->a, 257); + dst_pixels[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); + dst_pixels[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); + dst_pixels[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 -static void argb_u16_to_XRGB8888(struct vkms_frame_info *frame_info, - const struct line_buffer *src_buffer, int y) +static void argb_u16_to_XRGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in= _pixel) { - int x_dst =3D frame_info->dst.x1; - u8 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); - struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - src_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D 4) { - dst_pixels[3] =3D 0xff; - dst_pixels[2] =3D DIV_ROUND_CLOSEST(in_pixels[x].r, 257); - dst_pixels[1] =3D DIV_ROUND_CLOSEST(in_pixels[x].g, 257); - dst_pixels[0] =3D DIV_ROUND_CLOSEST(in_pixels[x].b, 257); - } + dst_pixels[3] =3D 0xff; + dst_pixels[2] =3D DIV_ROUND_CLOSEST(in_pixel->r, 257); + dst_pixels[1] =3D DIV_ROUND_CLOSEST(in_pixel->g, 257); + dst_pixels[0] =3D DIV_ROUND_CLOSEST(in_pixel->b, 257); } =20 -static void argb_u16_to_ARGB16161616(struct vkms_frame_info *frame_info, - const struct line_buffer *src_buffer, int y) +static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16= *in_pixel) { - int x_dst =3D frame_info->dst.x1; - u16 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); - struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - src_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D 4) { - dst_pixels[3] =3D cpu_to_le16(in_pixels[x].a); - dst_pixels[2] =3D cpu_to_le16(in_pixels[x].r); - dst_pixels[1] =3D cpu_to_le16(in_pixels[x].g); - dst_pixels[0] =3D cpu_to_le16(in_pixels[x].b); - } + u16 *pixels =3D (u16 *)dst_pixels; + + pixels[3] =3D cpu_to_le16(in_pixel->a); + pixels[2] =3D cpu_to_le16(in_pixel->r); + pixels[1] =3D cpu_to_le16(in_pixel->g); + pixels[0] =3D cpu_to_le16(in_pixel->b); } =20 -static void argb_u16_to_XRGB16161616(struct vkms_frame_info *frame_info, - const struct line_buffer *src_buffer, int y) +static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16= *in_pixel) { - int x_dst =3D frame_info->dst.x1; - u16 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); - struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - src_buffer->n_pixels); - - for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D 4) { - dst_pixels[3] =3D 0xffff; - dst_pixels[2] =3D cpu_to_le16(in_pixels[x].r); - dst_pixels[1] =3D cpu_to_le16(in_pixels[x].g); - dst_pixels[0] =3D cpu_to_le16(in_pixels[x].b); - } + u16 *pixels =3D (u16 *)dst_pixels; + + pixels[3] =3D 0xffff; + pixels[2] =3D cpu_to_le16(in_pixel->r); + pixels[1] =3D cpu_to_le16(in_pixel->g); + pixels[0] =3D cpu_to_le16(in_pixel->b); } =20 -static void argb_u16_to_RGB565(struct vkms_frame_info *frame_info, - const struct line_buffer *src_buffer, int y) +static void argb_u16_to_RGB565(u8 *dst_pixels, struct pixel_argb_u16 *in_p= ixel) { - int x_dst =3D frame_info->dst.x1; - u16 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); - struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; - int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), - src_buffer->n_pixels); + u16 *pixels =3D (u16 *)dst_pixels; =20 s64 fp_rb_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(31)); s64 fp_g_ratio =3D drm_fixp_div(drm_int2fixp(65535), drm_int2fixp(63)); =20 - for (size_t x =3D 0; x < x_limit; x++, dst_pixels++) { - s64 fp_r =3D drm_int2fixp(in_pixels[x].r); - s64 fp_g =3D drm_int2fixp(in_pixels[x].g); - s64 fp_b =3D drm_int2fixp(in_pixels[x].b); + s64 fp_r =3D drm_int2fixp(in_pixel->r); + s64 fp_g =3D drm_int2fixp(in_pixel->g); + s64 fp_b =3D drm_int2fixp(in_pixel->b); =20 - u16 r =3D drm_fixp2int(drm_fixp_div(fp_r, fp_rb_ratio)); - u16 g =3D drm_fixp2int(drm_fixp_div(fp_g, fp_g_ratio)); - u16 b =3D drm_fixp2int(drm_fixp_div(fp_b, fp_rb_ratio)); + u16 r =3D drm_fixp2int(drm_fixp_div(fp_r, fp_rb_ratio)); + u16 g =3D drm_fixp2int(drm_fixp_div(fp_g, fp_g_ratio)); + u16 b =3D drm_fixp2int(drm_fixp_div(fp_b, fp_rb_ratio)); =20 - *dst_pixels =3D cpu_to_le16(r << 11 | g << 5 | b); - } + *pixels =3D cpu_to_le16(r << 11 | g << 5 | b); +} + +void vkms_writeback_row(struct vkms_writeback_job *wb, + const struct line_buffer *src_buffer, int y) +{ + struct vkms_frame_info *frame_info =3D &wb->wb_frame_info; + int x_dst =3D frame_info->dst.x1; + u8 *dst_pixels =3D packed_pixels_addr(frame_info, x_dst, y); + struct pixel_argb_u16 *in_pixels =3D src_buffer->pixels; + int x_limit =3D min_t(size_t, drm_rect_width(&frame_info->dst), src_buffe= r->n_pixels); + + for (size_t x =3D 0; x < x_limit; x++, dst_pixels +=3D frame_info->cpp) + wb->pixel_write(dst_pixels, &in_pixels[x]); } =20 -void *get_frame_to_line_function(u32 format) +void *get_pixel_conversion_function(u32 format) { switch (format) { case DRM_FORMAT_ARGB8888: @@ -267,7 +245,7 @@ void *get_frame_to_line_function(u32 format) } } =20 -void *get_line_to_frame_function(u32 format) +void *get_pixel_write_function(u32 format) { switch (format) { case DRM_FORMAT_ARGB8888: diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkm= s_formats.h index 43b7c1979018..cf59c2ed8e9a 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.h +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -5,8 +5,8 @@ =20 #include "vkms_drv.h" =20 -void *get_frame_to_line_function(u32 format); +void *get_pixel_conversion_function(u32 format); =20 -void *get_line_to_frame_function(u32 format); +void *get_pixel_write_function(u32 format); =20 #endif /* _VKMS_FORMATS_H_ */ diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 991857125bb4..28a50d2149f5 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -1,24 +1,73 @@ // SPDX-License-Identifier: GPL-2.0+ =20 -#include "vkms_drv.h" +#include #include +#include +#include #include +#include +#include #include #include +#include =20 -static void vkms_connector_destroy(struct drm_connector *connector) -{ - drm_connector_cleanup(connector); -} +#include "vkms_drv.h" =20 static const struct drm_connector_funcs vkms_connector_funcs =3D { + .detect =3D vkms_connector_detect, .fill_modes =3D drm_helper_probe_single_connector_modes, - .destroy =3D vkms_connector_destroy, + .destroy =3D drm_connector_cleanup, .reset =3D drm_atomic_helper_connector_reset, .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 +static const struct vkms_config_connector * +find_config_for_connector(struct drm_connector *connector) +{ + struct vkms_device *vkms =3D drm_device_to_vkms_device(connector->dev); + struct vkms_configfs *configfs =3D vkms->configfs; + struct config_item *item; + + if (!configfs) { + pr_info("Default connector has no configfs entry"); + return NULL; + } + + 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->connector =3D=3D connector) + return config_connector; + } + + pr_warn("Could not find config to match connector %s, but configfs was in= itialized", + connector->name); + + return NULL; +} + +enum drm_connector_status vkms_connector_detect(struct drm_connector *conn= ector, + bool force) +{ + enum drm_connector_status status =3D connector_status_connected; + const struct vkms_config_connector *config_connector =3D + find_config_for_connector(connector); + + if (!config_connector) + return connector_status_connected; + + if (!config_connector->connected) + status =3D connector_status_disconnected; + + return status; +} + +static const struct drm_encoder_funcs vkms_encoder_funcs =3D { + .destroy =3D drm_encoder_cleanup, +}; + static int vkms_conn_get_modes(struct drm_connector *connector) { int count; @@ -30,82 +79,120 @@ static int vkms_conn_get_modes(struct drm_connector *c= onnector) } =20 static const struct drm_connector_helper_funcs vkms_conn_helper_funcs =3D { - .get_modes =3D vkms_conn_get_modes, + .get_modes =3D vkms_conn_get_modes, }; =20 -static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index, - struct drm_crtc *crtc) +static struct drm_connector * +vkms_connector_init(struct vkms_device *vkms_device) { - struct vkms_plane *overlay; + struct drm_connector *connector; + int ret; + + if (vkms_device->output.num_connectors >=3D VKMS_MAX_OUTPUT_OBJECTS) + return ERR_PTR(-ENOMEM); =20 - overlay =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index); - if (IS_ERR(overlay)) - return PTR_ERR(overlay); + connector =3D &vkms_device->output + .connectors[vkms_device->output.num_connectors++]; + ret =3D drm_connector_init(&vkms_device->drm, connector, + &vkms_connector_funcs, + DRM_MODE_CONNECTOR_VIRTUAL); + if (ret) { + memset(connector, 0, sizeof(*connector)); + vkms_device->output.num_connectors -=3D 1; + return ERR_PTR(ret); + } =20 - if (!overlay->base.possible_crtcs) - overlay->base.possible_crtcs =3D drm_crtc_mask(crtc); + drm_connector_helper_add(connector, &vkms_conn_helper_funcs); =20 - return 0; + return connector; } =20 -int vkms_output_init(struct vkms_device *vkmsdev, int index) +static struct drm_encoder *vkms_encoder_init(struct vkms_device *vkms_devi= ce) +{ + struct drm_encoder *encoder; + int ret; + + if (vkms_device->output.num_encoders >=3D VKMS_MAX_OUTPUT_OBJECTS) + return ERR_PTR(-ENOMEM); + + 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); + if (ret) { + memset(encoder, 0, sizeof(*encoder)); + vkms_device->output.num_encoders -=3D 1; + return ERR_PTR(ret); + } + return encoder; +} + +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 =3D &output->connector; - struct drm_encoder *encoder =3D &output->encoder; - struct drm_crtc *crtc =3D &output->crtc; + struct drm_connector *connector; + struct drm_encoder *encoder; + struct vkms_crtc *vkms_crtc; struct vkms_plane *primary, *cursor =3D NULL; int ret; int writeback; unsigned int n; =20 - primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, index); + primary =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY); if (IS_ERR(primary)) return PTR_ERR(primary); =20 - if (vkmsdev->config->overlay) { + if (vkmsdev->config.overlay) { for (n =3D 0; n < NUM_OVERLAY_PLANES; n++) { - ret =3D vkms_add_overlay_plane(vkmsdev, index, crtc); - if (ret) - return ret; + struct vkms_plane *overlay =3D vkms_plane_init( + vkmsdev, DRM_PLANE_TYPE_OVERLAY); + if (IS_ERR(overlay)) { + return PTR_ERR(overlay); + } } } =20 - if (vkmsdev->config->cursor) { - cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index); - if (IS_ERR(cursor)) + if (vkmsdev->config.cursor) { + cursor =3D vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR); + if (IS_ERR(cursor)) { return PTR_ERR(cursor); + } } =20 - ret =3D vkms_crtc_init(dev, crtc, &primary->base, &cursor->base); - if (ret) - return ret; + vkms_crtc =3D vkms_crtc_init(vkmsdev, &primary->base, + cursor ? &cursor->base : NULL, + "crtc-default"); + if (IS_ERR(vkms_crtc)) { + DRM_ERROR("Failed to init crtc\n"); + return PTR_ERR(vkms_crtc); + } =20 - ret =3D drm_connector_init(dev, connector, &vkms_connector_funcs, - DRM_MODE_CONNECTOR_VIRTUAL); - if (ret) { - DRM_ERROR("Failed to init connector\n"); - goto err_connector; + for (int i =3D 0; i < vkmsdev->output.num_planes; i++) { + vkmsdev->output.planes[i].base.possible_crtcs |=3D + drm_crtc_mask(&vkms_crtc->base); } =20 - drm_connector_helper_add(connector, &vkms_conn_helper_funcs); + connector =3D vkms_connector_init(vkmsdev); + if (IS_ERR(connector)) { + DRM_ERROR("Failed to init connector\n"); + return PTR_ERR(connector); + } =20 - ret =3D drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL); - if (ret) { + encoder =3D vkms_encoder_init(vkmsdev); + if (IS_ERR(encoder)) { DRM_ERROR("Failed to init encoder\n"); - goto err_encoder; + return PTR_ERR(encoder); } - encoder->possible_crtcs =3D 1; + 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) { - writeback =3D vkms_enable_writeback_connector(vkmsdev); + if (vkmsdev->config.writeback) { + writeback =3D vkms_enable_writeback_connector(vkmsdev, vkms_crtc); if (writeback) DRM_ERROR("Failed to init writeback connector\n"); } @@ -113,15 +200,175 @@ int vkms_output_init(struct vkms_device *vkmsdev, in= t index) drm_mode_config_reset(dev); =20 return 0; +} + +static bool is_object_linked(struct vkms_config_links *links, unsigned lon= g idx) +{ + return links->linked_object_bitmap & (1 << idx); +} + +int vkms_output_init(struct vkms_device *vkmsdev) +{ + 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; + + 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); + + 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); + + 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); + } + config_connector->connector =3D connector; + + for (int j =3D 0; j < output->num_connectors; j++) { + struct encoder_map *encoder =3D &encoder_map[j]; =20 -err_attach: - drm_encoder_cleanup(encoder); + 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; + } =20 -err_encoder: - drm_connector_cleanup(connector); + 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]; =20 -err_connector: - drm_crtc_cleanup(crtc); + if (!plane_entry->plane) + break; =20 - return ret; + 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 b3f8a115cc23..f69621822c1b 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -4,20 +4,17 @@ =20 #include #include +#include #include #include #include +#include +#include =20 #include "vkms_drv.h" #include "vkms_formats.h" =20 static const u32 vkms_formats[] =3D { - DRM_FORMAT_XRGB8888, - DRM_FORMAT_XRGB16161616, - DRM_FORMAT_RGB565 -}; - -static const u32 vkms_plane_formats[] =3D { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB16161616, @@ -70,6 +67,20 @@ static void vkms_plane_destroy_state(struct drm_plane *p= lane, kfree(vkms_state); } =20 +static void vkms_plane_destroy(struct drm_plane *plane) +{ + struct vkms_plane *vkms_plane =3D + container_of(plane, struct vkms_plane, base); + + if (plane->state) { + vkms_plane_destroy_state(plane, plane->state); + plane->state =3D NULL; + } + + drm_plane_cleanup(plane); + memset(vkms_plane, 0, sizeof(struct vkms_plane)); +} + static void vkms_plane_reset(struct drm_plane *plane) { struct vkms_plane_state *vkms_state; @@ -89,11 +100,12 @@ static void vkms_plane_reset(struct drm_plane *plane) } =20 static const struct drm_plane_funcs vkms_plane_funcs =3D { - .update_plane =3D drm_atomic_helper_update_plane, - .disable_plane =3D drm_atomic_helper_disable_plane, - .reset =3D vkms_plane_reset, + .update_plane =3D drm_atomic_helper_update_plane, + .disable_plane =3D drm_atomic_helper_disable_plane, + .destroy =3D vkms_plane_destroy, + .reset =3D vkms_plane_reset, .atomic_duplicate_state =3D vkms_plane_duplicate_state, - .atomic_destroy_state =3D vkms_plane_destroy_state, + .atomic_destroy_state =3D vkms_plane_destroy_state, }; =20 static void vkms_plane_atomic_update(struct drm_plane *plane, @@ -117,13 +129,23 @@ static void vkms_plane_atomic_update(struct drm_plane= *plane, frame_info =3D vkms_plane_state->frame_info; memcpy(&frame_info->src, &new_state->src, sizeof(struct drm_rect)); memcpy(&frame_info->dst, &new_state->dst, sizeof(struct drm_rect)); + memcpy(&frame_info->rotated, &new_state->dst, sizeof(struct drm_rect)); frame_info->fb =3D fb; memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->ma= p)); drm_framebuffer_get(frame_info->fb); + frame_info->rotation =3D drm_rotation_simplify(new_state->rotation, DRM_M= ODE_ROTATE_0 | + DRM_MODE_ROTATE_90 | + DRM_MODE_ROTATE_270 | + DRM_MODE_REFLECT_X | + DRM_MODE_REFLECT_Y); + + drm_rect_rotate(&frame_info->rotated, drm_rect_width(&frame_info->rotated= ), + drm_rect_height(&frame_info->rotated), frame_info->rotation); + frame_info->offset =3D fb->offsets[0]; frame_info->pitch =3D fb->pitches[0]; frame_info->cpp =3D fb->format->cpp[0]; - vkms_plane_state->plane_read =3D get_frame_to_line_function(fmt); + vkms_plane_state->pixel_read =3D get_pixel_conversion_function(fmt); } =20 static int vkms_plane_atomic_check(struct drm_plane *plane, @@ -132,7 +154,6 @@ static int vkms_plane_atomic_check(struct drm_plane *pl= ane, struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); struct drm_crtc_state *crtc_state; - bool can_position =3D false; int ret; =20 if (!new_plane_state->fb || WARN_ON(!new_plane_state->crtc)) @@ -143,20 +164,13 @@ static int vkms_plane_atomic_check(struct drm_plane *= plane, if (IS_ERR(crtc_state)) return PTR_ERR(crtc_state); =20 - if (plane->type !=3D DRM_PLANE_TYPE_PRIMARY) - can_position =3D true; - ret =3D drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, DRM_PLANE_NO_SCALING, DRM_PLANE_NO_SCALING, - can_position, true); + true, true); if (ret !=3D 0) return ret; =20 - /* for now primary plane must be visible and full screen */ - if (!new_plane_state->visible && !can_position) - return -EINVAL; - return 0; } =20 @@ -193,7 +207,7 @@ static void vkms_cleanup_fb(struct drm_plane *plane, drm_gem_fb_vunmap(fb, shadow_plane_state->map); } =20 -static const struct drm_plane_helper_funcs vkms_primary_helper_funcs =3D { +static const struct drm_plane_helper_funcs vkms_plane_helper_funcs =3D { .atomic_update =3D vkms_plane_atomic_update, .atomic_check =3D vkms_plane_atomic_check, .prepare_fb =3D vkms_prepare_fb, @@ -201,41 +215,27 @@ static const struct drm_plane_helper_funcs vkms_prima= ry_helper_funcs =3D { }; =20 struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, - enum drm_plane_type type, int index) + enum drm_plane_type type) { struct drm_device *dev =3D &vkmsdev->drm; - const struct drm_plane_helper_funcs *funcs; + struct vkms_output *output =3D &vkmsdev->output; struct vkms_plane *plane; - const u32 *formats; - int nformats; - - switch (type) { - case DRM_PLANE_TYPE_PRIMARY: - formats =3D vkms_formats; - nformats =3D ARRAY_SIZE(vkms_formats); - funcs =3D &vkms_primary_helper_funcs; - break; - case DRM_PLANE_TYPE_CURSOR: - case DRM_PLANE_TYPE_OVERLAY: - formats =3D vkms_plane_formats; - nformats =3D ARRAY_SIZE(vkms_plane_formats); - funcs =3D &vkms_primary_helper_funcs; - break; - default: - formats =3D vkms_formats; - nformats =3D ARRAY_SIZE(vkms_formats); - funcs =3D &vkms_primary_helper_funcs; - break; - } + int ret; + + if (output->num_planes >=3D VKMS_MAX_PLANES) + return ERR_PTR(-ENOMEM); + + plane =3D &output->planes[output->num_planes++]; + ret =3D drm_universal_plane_init(dev, &plane->base, 0, &vkms_plane_funcs, + vkms_formats, ARRAY_SIZE(vkms_formats), + NULL, type, NULL); + if (ret) + return ERR_PTR(ret); =20 - plane =3D drmm_universal_plane_alloc(dev, struct vkms_plane, base, 1 << i= ndex, - &vkms_plane_funcs, - formats, nformats, - NULL, type, NULL); - if (IS_ERR(plane)) - return plane; + drm_plane_helper_add(&plane->base, &vkms_plane_helper_funcs); =20 - drm_plane_helper_add(&plane->base, funcs); + drm_plane_create_rotation_property(&plane->base, DRM_MODE_ROTATE_0, + DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK); =20 return plane; } diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/v= kms_writeback.c index 84a51cd281b9..47449979c564 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ =20 #include +#include =20 #include #include @@ -15,6 +16,7 @@ #include "vkms_formats.h" =20 static const u32 vkms_wb_formats[] =3D { + DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB16161616, DRM_FORMAT_ARGB16161616, @@ -101,7 +103,8 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, struct drm_writeback_job *job) { struct vkms_writeback_job *vkmsjob =3D job->priv; - struct vkms_device *vkmsdev; + struct vkms_crtc *vkms_crtc =3D + container_of(connector, struct vkms_crtc, wb_connector); =20 if (!job->fb) return; @@ -110,8 +113,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_co= nnector *connector, =20 drm_framebuffer_put(vkmsjob->wb_frame_info.fb); =20 - vkmsdev =3D drm_device_to_vkms_device(job->fb->dev); - vkms_set_composer(&vkmsdev->output, false); + vkms_set_composer(vkms_crtc, false); kfree(vkmsjob); } =20 @@ -120,11 +122,11 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, { struct drm_connector_state *connector_state =3D drm_atomic_get_new_connec= tor_state(state, conn); - struct vkms_device *vkmsdev =3D drm_device_to_vkms_device(conn->dev); - struct vkms_output *output =3D &vkmsdev->output; - struct drm_writeback_connector *wb_conn =3D &output->wb_connector; + struct vkms_crtc *vkms_crtc =3D + drm_crtc_to_vkms_crtc(connector_state->crtc); + struct drm_writeback_connector *wb_conn =3D &vkms_crtc->wb_connector; struct drm_connector_state *conn_state =3D wb_conn->base.state; - struct vkms_crtc_state *crtc_state =3D output->composer_state; + struct vkms_crtc_state *crtc_state =3D vkms_crtc->composer_state; struct drm_framebuffer *fb =3D connector_state->writeback_job->fb; u16 crtc_height =3D crtc_state->base.crtc->mode.vdisplay; u16 crtc_width =3D crtc_state->base.crtc->mode.hdisplay; @@ -135,20 +137,24 @@ static void vkms_wb_atomic_commit(struct drm_connecto= r *conn, if (!conn_state) return; =20 - vkms_set_composer(&vkmsdev->output, true); + vkms_set_composer(vkms_crtc, true); =20 active_wb =3D conn_state->writeback_job->priv; wb_frame_info =3D &active_wb->wb_frame_info; =20 - spin_lock_irq(&output->composer_lock); + spin_lock_irq(&vkms_crtc->composer_lock); crtc_state->active_writeback =3D active_wb; + crtc_state->wb_pending =3D true; + spin_unlock_irq(&vkms_crtc->composer_lock); + wb_frame_info->offset =3D fb->offsets[0]; wb_frame_info->pitch =3D fb->pitches[0]; wb_frame_info->cpp =3D fb->format->cpp[0]; + crtc_state->wb_pending =3D true; - spin_unlock_irq(&output->composer_lock); + spin_unlock_irq(&vkms_crtc->composer_lock); drm_writeback_queue_job(wb_conn, connector_state); - active_wb->wb_write =3D get_line_to_frame_function(wb_format); + active_wb->pixel_write =3D get_pixel_write_function(wb_format); drm_rect_init(&wb_frame_info->src, 0, 0, crtc_width, crtc_height); drm_rect_init(&wb_frame_info->dst, 0, 0, crtc_width, crtc_height); } @@ -160,9 +166,10 @@ static const struct drm_connector_helper_funcs vkms_wb= _conn_helper_funcs =3D { .atomic_commit =3D vkms_wb_atomic_commit, }; =20 -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev) +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, + struct vkms_crtc *vkms_crtc) { - struct drm_writeback_connector *wb =3D &vkmsdev->output.wb_connector; + struct drm_writeback_connector *wb =3D &vkms_crtc->wb_connector; =20 drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); =20 diff --git a/include/drm/drm_fixed.h b/include/drm/drm_fixed.h index 553210c02ee0..6ea339d5de08 100644 --- a/include/drm/drm_fixed.h +++ b/include/drm/drm_fixed.h @@ -25,6 +25,7 @@ #ifndef DRM_FIXED_H #define DRM_FIXED_H =20 +#include #include =20 typedef union dfixed { @@ -70,6 +71,7 @@ static inline u32 dfixed_div(fixed20_12 A, fixed20_12 B) } =20 #define DRM_FIXED_POINT 32 +#define DRM_FIXED_POINT_HALF 16 #define DRM_FIXED_ONE (1ULL << DRM_FIXED_POINT) #define DRM_FIXED_DECIMAL_MASK (DRM_FIXED_ONE - 1) #define DRM_FIXED_DIGITS_MASK (~DRM_FIXED_DECIMAL_MASK) @@ -86,6 +88,11 @@ static inline int drm_fixp2int(s64 a) return ((s64)a) >> DRM_FIXED_POINT; } =20 +static inline int drm_fixp2int_round(s64 a) +{ + return drm_fixp2int(a + (1 << (DRM_FIXED_POINT_HALF - 1))); +} + static inline int drm_fixp2int_ceil(s64 a) { if (a > 0) --=20 2.41.0.640.ga95def55d0-goog