From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 E39B6379C50 for ; Sat, 18 Jul 2026 23:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417782; cv=none; b=l51qyBTDkWc+++J3PYSrpyg8jhiArxnkFxGWqlNzSXcg5g6Rw05KuiqDv5AQa4uZK+GuU5BRa1mfWJyMzKETH4aYaOvxhBJicyjUBJP8Eo6LzT4mPISQPCkjAAKXUxxP9iydWU4stzEhM7IRKMFUr4ZTxB+KgO7ovTCx9zU5KQM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417782; c=relaxed/simple; bh=uAbddcMyRgpLPl1Ml7UGFgQr7U5XL5NUVGp3YEItfuo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g4CcSXNd0i31iFIRmUGxCCsOzPRjI7hX68HdX2HAYZUP/AE0jfAmn91UerKPmrTQas9Jcc/JB6fgUjlxihUANYGzOdA71966i6p/pChtGjGVOihdhtg5SZlBk/Dfe3Yxo8YmLyhVrMYDaKHLFbohKxWrQWRZAVTKDR6S5vGWEEo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KtlCcNee; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KtlCcNee" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4955484387cso2480265e9.1 for ; Sat, 18 Jul 2026 16:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784417779; x=1785022579; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/m2It/8MnIxoX8xbOWjx4p2UhJgFTMfhBAqsULip3yI=; b=KtlCcNeegq5ZtXkQLi3SgIe2cScOLVwBgT2+Mp00KKdDJ/F5VTJjghruZIuV0GJyg5 +2gWRbYwjabq1qIqz3RRIODN7mUTQIw9j7iPfySmd5ctxFzqMs1zJJzmG35jAj6SvR1C qcZcE25uATYX+EL5Gmf4QiAmw2Y8Dkmhso26VCB23c6vCAPSgJCF3NgeYsZmZLTXdw5/ 5O/zlSq1enFEEvR71n5feczUq+q/iS98MDItUQ7JQBE5L26NPE19MlYIbV0rZnAwglXJ kSfRFeU/Xdc9K/tS6UJNNzzXcwHzeNCmukY1RflNsG9AP9JeKyczPGRymtzq06o1GAwv 986g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784417779; x=1785022579; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=/m2It/8MnIxoX8xbOWjx4p2UhJgFTMfhBAqsULip3yI=; b=dGlkBcc7zYm+mEKNY3oEg9ZjX/FF9QB0jzXuNRF2Yoknsd9jngYE7ZJ8JbHVy0I+00 K8gjbtus3ss68BM/ERnvGpqEqIwoTZOneRJVt5Fm3zls4JvQdoOdzhSJDT4yctGAXAMv /RAhNOWQ03TR82OiC6zjXsxdLiRhvROJN5+A1ZvJzT3T6MW7fYZNESTjqypzl003yrYT kkweeZRPOa8qFdSo+iioX+TO9CUISDu4eLwSspMeM3gkL2Cqki36xvOFk7MOencXI4+k H4cjfVAsvM7kGcBjB9o0JWd0oLh3W73cTb1iXSnXoEU4udW1TaWF/uCOR3Ywk7FD4Byx 7kzA== X-Forwarded-Encrypted: i=1; AHgh+Roo3UyVOhXiqNIX32+Z0/7/7kavAiaItEeINdGVJLONmp4H7eGvIqOv/4B8aT3NirnnImRdzZk/Fzn+Ggc=@vger.kernel.org X-Gm-Message-State: AOJu0YyruLfFC8baOhyIMgXmvCup6/dLcOpHCAl4QJ3Ar7RHxWWD4T2a 2re6ILL78g1NjwnBW2zuU4vj0WhNYI+z//tmhuTAUEJKG0QKi6r6UhFr X-Gm-Gg: AfdE7cn5cjSc/Poc0qFWBR8t2Pl8GK+SGEg+tvq+62WA1HDMsfBaqtH+iHDvJk4Ndmk xHjZj/H7Kikqr4VoRR78R8o/9PpWUO0y+yxt5ruQy+p4LPdu4Nk6Ki3KXBU6H9boL62HieAboCK zyPA8D/IWBUlTIz//UWejS0dYHNC04WJIpSg6QFTAAmAQQkBFUQ24CN5xH8nRRQeOhjtEruzHGK vOF4B547YPvzz9h0R8Sz4B+yX7vyivd0LUdzy2FF/MTVwb0J9wnTlXH2M7o5cR/A12pp/+7sjt1 kfy6O7EWVShM2y85cTi9qO5pZWO4GI81SDs7eeLh8YNJ6hQ0/6n6OQOypMbQ+f0ed5YifY/q/1W LoxY0p97Fs18MzxLOpgJuLl4MQ1q9xK1sYCsECIXHRmL/L3jlk0SEMms90/B/vErEvfam6zIwcm UhbPaTRo3MPOyeyZPaDoOH X-Received: by 2002:a7b:ca50:0:b0:495:3fe1:4ce4 with SMTP id 5b1f17b1804b1-4954a40c110mr70449165e9.26.1784417779234; Sat, 18 Jul 2026 16:36:19 -0700 (PDT) Received: from [127.0.0.2] ([2a01:14:111:ccf0:645b:9e5c:7fe3:c09f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4954a2a24b6sm160964675e9.3.2026.07.18.16.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 16:36:18 -0700 (PDT) From: Diogo Silva Date: Sun, 19 Jul 2026 01:35:37 +0200 Subject: [PATCH 06/15] drm/virtio: remove dependency on DRM simple helpers 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: 7bit Message-Id: <20260719-drm_simple_encoder_init-v1-6-a78c509e3062@gmail.com> References: <20260719-drm_simple_encoder_init-v1-0-a78c509e3062@gmail.com> In-Reply-To: <20260719-drm_simple_encoder_init-v1-0-a78c509e3062@gmail.com> To: Jingoo Han , Inki Dae , Seung-Woo Kim , Kyungmin Park , David Airlie , Simona Vetter , Krzysztof Kozlowski , Peter Griffin , Alim Akhtar , Laurent Pinchart , Tomi Valkeinen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Michal Simek , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Stefan Agner , Alison Wang , Anitha Chrisanthus , David Airlie , Gerd Hoffmann , Dmitry Osipenko , Gurchetan Singh , Chia-I Wu , Jyri Sarha , Liu Ying , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Geert Uytterhoeven , Xinliang Liu , Sumit Semwal , Yongqin Liu , John Stultz , Liviu Dudau , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Jonathan Corbet , Shuah Khan Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, virtualization@lists.linux.dev, imx@lists.linux.dev, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-doc@vger.kernel.org, Diogo Silva X-Mailer: b4 0.15.2 The simple KMS helpers are deprecated because they only add an intermediate layer between drivers and atomic modesetting. Open-code drm_simple_encoder_init() by calling drm_encoder_init() directly and providing driver-local drm_encoder_funcs. Also check the return value from drm_encoder_init() to avoid silent failures. Signed-off-by: Diogo Silva --- drivers/gpu/drm/virtio/virtgpu_display.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index 44ffffec550f..67023d91d40b 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -28,11 +28,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include @@ -232,6 +232,10 @@ static enum drm_mode_status virtio_gpu_conn_mode_valid(struct drm_connector *con return MODE_BAD; } +static const struct drm_encoder_funcs virtio_gpu_enc_funcs = { + .destroy = drm_encoder_cleanup, +}; + static const struct drm_encoder_helper_funcs virtio_gpu_enc_helper_funcs = { .mode_set = virtio_gpu_enc_mode_set, .enable = virtio_gpu_enc_enable, @@ -306,7 +310,11 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index) if (vgdev->has_edid) drm_connector_attach_edid_property(connector); - drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL); + ret = drm_encoder_init(dev, encoder, &virtio_gpu_enc_funcs, + DRM_MODE_ENCODER_VIRTUAL, NULL); + if (ret) + return ret; + drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs); encoder->possible_crtcs = 1 << index; -- 2.54.0