From nobody Tue Dec 16 14:22:27 2025 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) (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 8521712FF69 for ; Tue, 14 Jan 2025 14:06:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736863571; cv=none; b=hvxSQ2ajejG7VYah+q5c7QrzV/WqlfYlZ3K/gCN7AILGD5i0wMSdLJremQrJfBasJrKCBMV8FRYhlfp9IyGd67iYpgfUw2D+d9KXFV34L/G1kj/H2aFhVadIVBQcWAB2hF1sVHQfk1whB7EhFGmpehKajv4kxsC94VcnoREQZh0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736863571; c=relaxed/simple; bh=Sp3pqA6hkZX9n+1YVNJEqNXdRm8N2eRH5m6LOQD3GtM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M4+FBzoagH4MEkgQPPDb293Mx4Gv3YUUhlRWJOrnIe6C34H/O0u7RYNUAkgd+mrDpaVeN3bpPZ3VkD1D2iOApCrIb/XLxwfW1/Sb5yG5thCRwEEScYmlu9hcOGM5E2u9GLYkBIIXv8BXp2qVrU+eLH5HYWtcg9Xi0CzdLBP70Mg= 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=XOnQA1/p; arc=none smtp.client-ip=217.70.183.198 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="XOnQA1/p" Received: by mail.gandi.net (Postfix) with ESMTPSA id 249BCC000F; Tue, 14 Jan 2025 14:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1736863561; 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=O3siswyDnJUjiz5TlZzFY3sfnn2PJfMpAj4ZraYxKJs=; b=XOnQA1/pWekiCmg9bLJDQnKenlV+tnRbAvoyNX+AyQ0M8l8UleA+hbp5o9JDJSTuvCdeKK yX1F2LGzZ/hdMu0kRXZ19W68A7fNydnZ5Ncc31JtrRHjSq2qLcB+6qFR91EaCxg+/hK0c6 VFcyCBAQnjV+jWKasdLGAKaxRt5Qsxo3GhyKULrbpwUSzgk8MuZUaUaxCwd2lj5BAi5DV0 xl4q1N5grSGNoTOgE2A+NHPUF7+THweEZquunaKAEdgvbkfMyPcMlOIRp6Zl6DzdrvL8tM ozD/KoXCbnw/YmOizA109W7kfwJMjTDSE4CWmaZ4ALwO9p7Q+MyYSRlwUU+shA== From: Louis Chauvet Date: Tue, 14 Jan 2025 15:05:44 +0100 Subject: [PATCH v8 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: <20250114-google-vkms-managed-v8-2-da4254aa3dd5@bootlin.com> References: <20250114-google-vkms-managed-v8-0-da4254aa3dd5@bootlin.com> In-Reply-To: <20250114-google-vkms-managed-v8-0-da4254aa3dd5@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=2003; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=Sp3pqA6hkZX9n+1YVNJEqNXdRm8N2eRH5m6LOQD3GtM=; b=owEBbQKS/ZANAwAIASCtLsZbECziAcsmYgBnhm9EtcsIN2bJS1WgkcTQ7+4uLTXTuW6WX1Zs6 3NW1xQYueWJAjMEAAEIAB0WIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCZ4ZvRAAKCRAgrS7GWxAs 4vXFD/4mechptPuL2c/AorSw65ExO3+ydrZJncHPi9FzQgejdJtIqHK2HXm7iLwOYhxAmDNLwqH 5WLhZQuf1WI4OVD1GM7jwSHhfnMrw/NCwQfKnucBI75zNJJTQT+pMHPHwNmFRLbV6Cw8iuppaC6 JnB6GED/4JO8TIVPfjdLmiXX7iRnx0CWaj58aRTU6uMJyQzyxlqjTgrJ9AyaF7zwi2I0WQNISXd WMTo0yKbBGMOX+Mjt4/T5e0JPUX2xBe+MsehJgkNaQ/nZiR+q75s7t6hHWE4L+V8iYrmN1dw6Wg gcis2pdOSUzqMUiv5vA0wLco1Ajx5KoyupHZ1cbkrRJPI6uwc4nGYTCEiaW6t48A4ynPrH3e7YN RGeHbb1ALanYm3onGzLuwKQ4uK1zKQhTPJHibMH/c6oprTng8RfGBKBAgnR1enmbeXBmepwdGAA btogZP3FjsE3+U+PQHTdpt2OyjIkwwq20yy9c+W5BETZMXI/v22DpbDQ7160gGtytydw9PCVLbt 5DWNoyoraptdxeG2cmUk4+Yf25Gge7awgDmmLy6i4HdTuefHKmvZWwignUW5fve8YXahhZfI7m9 0JkrDFdlQMEzUJ5UVar72jJSi8AF+qcPlqyrnGlT5XM5uG840tWukNVIqeeiazjdtg9+Sj2KHrq 33u6GPdk2IrpFTg== 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 Signed-off-by: Louis Chauvet Reviewed-by: Jos=C3=A9 Exp=C3=B3sito --- 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