From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B457824024E for ; Tue, 14 Jan 2025 09:06:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736845589; cv=none; b=Zw7atMAvKUV4LylkFr6cRmGkJZoYXcdt16CeblzaPPZbMKhNotRTOpHAePey0RpVkztKEdaubclQ3/sbqqi1QCOj7yE1am2Kt4mIeqnYJzawMDKSKlT4pbB2/x0AdMUiwkXK8kqMkZZSZVQnvThhZqEjsF58OT5JcEYeM7WmVnw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736845589; c=relaxed/simple; bh=vZZB0GDnw5+R40Z4DWemx6Qcy7vrkhO6paqW6AxrPD8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=KUhRdSGxC/YGy5SjdCWgQ+qAmTEJJXnrlliLl8HdC2yUl14FOUFBavq68VJHq7yO4Dom8oikgiLDOAwp12KcOI52SvPP1Uz4jgLDwng/PICjBqyYkkBBtELPV10wQCWLMI5yGbn4avtNuLXmF8lHPE4P0VTw0wEmSwBXgX23Kx0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=WxuYFthI; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Zo/e1+8S; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=WxuYFthI; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=Zo/e1+8S; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="WxuYFthI"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Zo/e1+8S"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="WxuYFthI"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Zo/e1+8S" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BBCC621196; Tue, 14 Jan 2025 09:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1736845585; h=from:from:reply-to: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:autocrypt:autocrypt; bh=/bbZCGuY+5ajCVG5tIZ3yEaPU1pcF28+XTdoO1a3tBw=; b=WxuYFthIDMBUavGVuInwpudCP4SriWD1aQse1Anr9hh4C05dJ1mDvVhVCPYtxtUPBeKMmk /UsWDTD+JB+E2e7M6mNMP8AMRrU1BI2ut7JLHjAcod2n3KGco/w+GGG+vfwLAw6GaC3Dnq jQjmvp7s/liE87DlDher+WqNwSIa+A8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1736845585; h=from:from:reply-to: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:autocrypt:autocrypt; bh=/bbZCGuY+5ajCVG5tIZ3yEaPU1pcF28+XTdoO1a3tBw=; b=Zo/e1+8SUo7EGGcXc1bxUkXxlkvhr/PtX1eh8bbXO71e4mE64UYjmfxQ0MWBR5Nsa2qFup O/bW6esufOt3icBA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1736845585; h=from:from:reply-to: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:autocrypt:autocrypt; bh=/bbZCGuY+5ajCVG5tIZ3yEaPU1pcF28+XTdoO1a3tBw=; b=WxuYFthIDMBUavGVuInwpudCP4SriWD1aQse1Anr9hh4C05dJ1mDvVhVCPYtxtUPBeKMmk /UsWDTD+JB+E2e7M6mNMP8AMRrU1BI2ut7JLHjAcod2n3KGco/w+GGG+vfwLAw6GaC3Dnq jQjmvp7s/liE87DlDher+WqNwSIa+A8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1736845585; h=from:from:reply-to: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:autocrypt:autocrypt; bh=/bbZCGuY+5ajCVG5tIZ3yEaPU1pcF28+XTdoO1a3tBw=; b=Zo/e1+8SUo7EGGcXc1bxUkXxlkvhr/PtX1eh8bbXO71e4mE64UYjmfxQ0MWBR5Nsa2qFup O/bW6esufOt3icBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3A063139CB; Tue, 14 Jan 2025 09:06:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id T8HgDBEphmeacAAAD6G6ig (envelope-from ); Tue, 14 Jan 2025 09:06:25 +0000 Message-ID: Date: Tue, 14 Jan 2025 10:06:24 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 3/7] drm/vkms: Switch to managed for crtc To: Louis Chauvet , Rodrigo Siqueira , Melissa Wen , =?UTF-8?Q?Ma=C3=ADra_Canal?= , Haneen Mohammed , Maarten Lankhorst , Maxime Ripard , 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, =?UTF-8?Q?Ma=C3=ADra_Canal?= References: <20250113-google-vkms-managed-v7-0-4f81d1893e0b@bootlin.com> <20250113-google-vkms-managed-v7-3-4f81d1893e0b@bootlin.com> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: <20250113-google-vkms-managed-v7-3-4f81d1893e0b@bootlin.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; URIBL_BLOCKED(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo,igalia.com:email,bootlin.com:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[19]; ARC_NA(0.00)[]; FREEMAIL_TO(0.00)[bootlin.com,gmail.com,riseup.net,linux.intel.com,kernel.org,ffwll.ch]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TAGGED_RCPT(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[igalia.com:email,imap1.dmz-prg2.suse.org:helo,suse.de:mid,bootlin.com:email] X-Spam-Score: -2.80 X-Spam-Flag: NO Hi Am 13.01.25 um 18:09 schrieb Louis Chauvet: > 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 Alphabetical order please. > > #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); > +} > + This could be implemented in drm_managed.c. drmm_alloc_ordered_workqueue() would call alloc_ordered_workqueue() and set up the managed callback as well. Best regards Thomas > 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, > -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)