From patchwork Mon Dec 30 18:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Louis Chauvet X-Patchwork-Id: 13923416 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A413E7718F for ; Mon, 30 Dec 2024 18:37:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 30DB610E28F; Mon, 30 Dec 2024 18:37:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="KGNYrizO"; dkim-atps=neutral Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64DE510E28F for ; Mon, 30 Dec 2024 18:37:48 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9E449E0006; Mon, 30 Dec 2024 18:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1735583866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LY2O50zsA6s/xcwj2ByPp9+wVZ9Z+1qLAMiiqprNuz8=; b=KGNYrizOI//T5/J+B4YLELR2271hw8WzvA7IKTjNGTeFQVk01YKYfa4aPZmMY2PflHEr+W wJJjEHc1f15RwJFl7FOPcrxNcefo5LJeV/RVIJ2TE2Y2OKRIsxmFmfnqk+mJF61Z652n0t 8bnRhvJRMrk6aBK3yy+UuDTk5NhuHaXUOCWD3Fqb9LjFBBmxGtQQTwVOqv02DXUHU7Yhbj nBNpNZi+NAvlzat3N1HXJ8m8S4oHCalA91+uZ9dZ9FA7uQ38o5RoyNvdznW7gl405xk9+d nuqjJHDoHqD61SWTMIdGkHWJMJzVfTDCpzG4jxWIK985DyQUbTLaDw6SaM6ZKw== From: Louis Chauvet Date: Mon, 30 Dec 2024 19:37:33 +0100 Subject: [PATCH v6 3/8] drm/vkms: Switch to managed for crtc MIME-Version: 1.0 Message-Id: <20241230-google-vkms-managed-v6-3-15c7d65cd63b@bootlin.com> References: <20241230-google-vkms-managed-v6-0-15c7d65cd63b@bootlin.com> In-Reply-To: <20241230-google-vkms-managed-v6-0-15c7d65cd63b@bootlin.com> To: Rodrigo Siqueira , Melissa Wen , =?utf-8?q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Simona Vetter Cc: dri-devel@lists.freedesktop.org, arthurgrillo@riseup.net, linux-kernel@vger.kernel.org, jeremie.dautheribes@bootlin.com, miquel.raynal@bootlin.com, thomas.petazzoni@bootlin.com, seanpaul@google.com, nicolejadeyee@google.com, Louis Chauvet , =?utf-8?q?Ma=C3=ADra_Canal?= X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2850; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=n0VghhJrbrmKmRsfwMlZZWoRm6homaUFqv46ilHrHUU=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBncuhx/06LEii3IaTWmbE7XY7WLevxr6qDbJGoS rc/82iK0iOJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ3LocQAKCRAgrS7GWxAs 4l8FD/9Ubicq7DGnYlHJPhdSu3S5imYv7nQCP/GSy9hsvS941RR6iks/bmaIA/IUPh/6kAglFO8 JUWzIQZ/m/qJiJtbNnZuV+0xb1EzW65LqAANaHTJmCg+M+zUWszLsGWwG2HshO/go13rCiR++j2 fXWrZ/RWrjW1CwPCoZOoUd5Gn0p4ODBTmkgx5gPhlL/vWDwXH5y6nq9qdBShP9ggDgeUSfdDCbc UaTDxOe2Rk99o0ayJ28r1K79BjbVF8qewXHWksXIVDcJDXwlg21gfdKZJuPzNljY/G8RC2YIbVR p1ZgEZMZtWR++buFeF8NGEKW3kvo3lFtuVEB6SYz0VGnK6/zcENIwhy52Jw8RuJvfy/zO10YQGK E0o6zEuGFk8GE233jRty2HizHI+kOUkLi697P845UOgq77J1bp7ldpauZUxiWBHnrWqYC2Xl1Ra YxVt1bR9a+GzbZFGcjiOKuKNjL4n2SPJTRkfAsAuUUQLOMPfQKCfV3+xNv9W/nUHpFYu7ttH0k9 vYB71pJQ7Dm/Kt9ttA0YGMpkyO/kfX/r9JcvS0Ek4GVxa1p6daW1KX18ATsU/PPcquIMCd/8rV9 /zSJ6/JrpKpihNhNWpxYiwu3OiJjQkNJP4lQGbsb3Haea4fQLEM1gikUejCXP6vKsryHk5ZDSio Xl0SxqkqLwzl5Bg== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The current VKMS driver uses managed function to create crtc, but don't use it to properly clean the crtc workqueue. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers. Reviewed-by: Maxime Ripard Reviewed-by: Maíra Canal Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_crtc.c | 14 ++++++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 9 --------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 28a57ae109fcc05af3fe74f94518c462c09119e3..ace8d293f7da611110c1e117b6cf2f3c9e9b4381 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "vkms_drv.h" @@ -270,6 +271,14 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = { .atomic_disable = vkms_crtc_atomic_disable, }; +static void vkms_crtc_destroy_workqueue(struct drm_device *dev, + void *raw_vkms_out) +{ + struct vkms_output *vkms_out = raw_vkms_out; + + destroy_workqueue(vkms_out->composer_workq); +} + int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *primary, struct drm_plane *cursor) { @@ -300,5 +309,10 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, if (!vkms_out->composer_workq) return -ENOMEM; + ret = drmm_add_action_or_reset(dev, vkms_crtc_destroy_workqueue, + vkms_out); + if (ret) + return ret; + return ret; } diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index e0409aba93496932b32a130ebb608ee53b1a9c59..7c142bfc3bd9de9556621db3e7f570dc0a4fab3a 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -53,14 +53,6 @@ MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support"); DEFINE_DRM_GEM_FOPS(vkms_driver_fops); -static void vkms_release(struct drm_device *dev) -{ - struct vkms_device *vkms = drm_device_to_vkms_device(dev); - - if (vkms->output.composer_workq) - destroy_workqueue(vkms->output.composer_workq); -} - static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state) { struct drm_device *dev = old_state->dev; @@ -108,7 +100,6 @@ static const struct drm_debugfs_info vkms_config_debugfs_list[] = { static const struct drm_driver vkms_driver = { .driver_features = DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM, - .release = vkms_release, .fops = &vkms_driver_fops, DRM_GEM_SHMEM_DRIVER_OPS, DRM_FBDEV_SHMEM_DRIVER_OPS,