From nobody Sun Dec 14 14:09:47 2025 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5387122A7E4 for ; Thu, 16 Jan 2025 17:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737049833; cv=none; b=r96KmedPek+ciGAmHH9o5pZiiM7+oeqiWu41a4XNF1yUvE1QvbFpyL05cT0VFKkxvM8R6FwgdJ/pYCvqskKRAsZE9DC1b1Gzq2GKMCgYIHLj+bAaCI9ueIoOXPfuyTun0qOdzr58yJ3fDhyLumcC7Y9zSE6bw704x6zoPSrGuHA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737049833; c=relaxed/simple; bh=KX/HAkpNK4I0905KpjeAVbCo6ZEtfEvZdVMjcNb0FPw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Gb1jiPGfQKFqVC9vYtACh8PWs0s5L21KxXxCWUW4iXu1srDUoHZV7Q9cDUKjYZ2FhohzylIzTWNk9rHnDR0qJNixl/0i3cRbAP2VA/D4FxJ3t18FQHv7ebU8cAARkU+CD4L9tnOCbSOiglQ++R0SiTNPFF3xlcjrY+3ST4Q0L+E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=hmUC/mnE; arc=none smtp.client-ip=217.70.183.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="hmUC/mnE" Received: by mail.gandi.net (Postfix) with ESMTPSA id 977E360009; Thu, 16 Jan 2025 17:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1737049824; 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=jEZHk/1SbjAWFJgGVljCi7CCHvNiVINr3GrqFQeJNvQ=; b=hmUC/mnE6kGC3NfBHbYG0a86lUZZJS+rlvpChu5fErRSAsbPoUcohraRLZTxjOdFGwmEYr 1v8aH3wdMdptDyd12aVMbe9LOyi03cnecrOnpNOXGeI3xFK0ZWAlGO1HKQQXpYbgOBUaSJ +TCAurRgZd1a8rvEiqs0mf/spz0KzQVbXTX5XKyRyBV9fnvAAgdFLrO0f0slr+ChiK476Q eencke991rmPYwDwAU299vWKSygHbGQtmHTZvDnqkfxS8uCHrV9R65InIsoLTqCsefAIJw WDcEGPOatDjT1yMLqpMqfUglrMJI9dBE3upJEEzBwBesLhOg6GrmUSYr2HZBWA== From: Louis Chauvet Date: Thu, 16 Jan 2025 18:47:14 +0100 Subject: [PATCH v9 2/8] drm/vkms: Switch to managed for encoder Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250116-google-vkms-managed-v9-2-3e4ae1bd05a0@bootlin.com> References: <20250116-google-vkms-managed-v9-0-3e4ae1bd05a0@bootlin.com> In-Reply-To: <20250116-google-vkms-managed-v9-0-3e4ae1bd05a0@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?= , =?utf-8?q?Jos=C3=A9_Exp=C3=B3sito?= X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2061; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=KX/HAkpNK4I0905KpjeAVbCo6ZEtfEvZdVMjcNb0FPw=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBniUbaB9GjM17vIvmIm1h990QAP/kMnzoB78Jl/ TygW0hqka2JAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ4lG2gAKCRAgrS7GWxAs 4jDaD/4/TmWNKnw2T9d8qeFpvIzhLPWGpxF4ZncZWZefYrDFX30xLXUH86lN7+yNb5+700+pUKA GnwkbZqfQtA9h/buqWeP5rkPlbt+H02xlyw9iLXEDhL/Gwce0rIEgsaFZCpqz9uUiVu/L5j0Ucv NifJQAfxtQbDTzNznCDcr2cqtV6qv8A66NIPqI88BdnWW1JpanPdUUYpb6IoK3/SH9a3NewVzPp G3pc6CTMJ8X/CjCiW8m1i1oCzfDiAYcM907bgoVlz4rsHLUx4v6cDMVCiuDAfCs04pdlh2FqHgW 094WxEcDgxgV//JX+xqYeJKe2vjrdeh98a8VAfIFPJszX4UEZuJgHinhGRcR48s8UsY9N0B3Z4Y tcT3G6rBjqpHyyqQNsUomh5GY8SjW50zTASU1t9gaCAyL/vCoADfDf2bEgLkAyagTD6eAR324ns 986kCDynIHex0uvViAA6FTsw3QRbNoqLHYZ2BXVfbKkPuq6Wh2GBZu0Gd1T0cYsnsY4cM7bSL/b zcd5S5igf4wcQO4DXMNoopKhVOrEYrpiW8AZoulNe9e0BUQt0hnHI5QkkezRUzMX7tck8+kWsVp g3envLnhLSs+FqgTSwubK35bY4wEI55osQ8e2sstWEgyOa/KkzZvYW2us/HEK4OCsuWDsgBIAqX T8e+AnYCx4QAW7g== X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-GND-Sasl: louis.chauvet@bootlin.com The current VKMS driver uses non-managed function to create encoders. 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=C3=ADra Canal Reviewed-by: Thomas Zimmermann Reviewed-by: Jos=C3=A9 Exp=C3=B3sito Signed-off-by: Louis Chauvet --- drivers/gpu/drm/vkms/vkms_output.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms= _output.c index 570823ecb28f589e6323036590ec05a2f633bc9b..ab9affa75b66ce9f00fe0250524= 39405206144ec 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -13,10 +13,6 @@ static const struct drm_connector_funcs vkms_connector_f= uncs =3D { .atomic_destroy_state =3D drm_atomic_helper_connector_destroy_state, }; =20 -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; @@ -84,8 +80,8 @@ int vkms_output_init(struct vkms_device *vkmsdev) =20 drm_connector_helper_add(connector, &vkms_conn_helper_funcs); =20 - ret =3D drm_encoder_init(dev, encoder, &vkms_encoder_funcs, - DRM_MODE_ENCODER_VIRTUAL, NULL); + ret =3D drmm_encoder_init(dev, encoder, NULL, + DRM_MODE_ENCODER_VIRTUAL, NULL); if (ret) { DRM_ERROR("Failed to init encoder\n"); return ret; @@ -95,7 +91,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) 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) { @@ -108,7 +104,5 @@ int vkms_output_init(struct vkms_device *vkmsdev) =20 return 0; =20 -err_attach: - drm_encoder_cleanup(encoder); return ret; } --=20 2.47.1