From mboxrd@z Thu Jan 1 00:00:00 1970 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 2A09FC4452D for ; Mon, 20 Jul 2026 15:41:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83AB510E1D6; Mon, 20 Jul 2026 15:41:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E6BZ9qK7"; dkim-atps=neutral Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 322BD10E1D6 for ; Mon, 20 Jul 2026 15:40:59 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-47f785467faso722985f8f.2 for ; Mon, 20 Jul 2026 08:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784562057; x=1785166857; darn=lists.freedesktop.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=O7zJzFQDZ2ba/zKljTx71fkG4BHmnEG0mOPFGgp16IY=; b=E6BZ9qK7EtCtp7+ea25nRXDD9qE1GdtFAVab898ml/5/UevH4oelQOZhdOTI1/EW0C ++wsXyx5KOO3MnSPx0pnLFzZxaLUpo5ZMSstuYn2xEMRpEBIcViCL9/kjIgB5pRoLVVA mzVBTtMEZ/fF+y/Zm8pBjlCv0BTe/O3DLFVz3wZvTzy8UXkKeXpQZ1O2LAH2oplJUdja 5VlMGhRx38hs6pXT6sZbxLOJD3pub2KvCTOFpYpnkjvpl8x2QkqL0XR2mK9U/ATXDxNF ehfTPeYDGN83qelSmCvTo5Mb3eZ2I6sHmKpF+/Iqou70ztUHOvn0LnBvjbPtC3zU763X MEpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784562057; x=1785166857; 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=O7zJzFQDZ2ba/zKljTx71fkG4BHmnEG0mOPFGgp16IY=; b=V20/3laMOYm3TyTqeHtcvXBAGA2Cwju8I+uNudsbdnwUOu666/jZTuSvlB5RS0mxgR HriKqGSAuaa8s0gi0XsJSGh3ylhIUSNp7hevXK6AwX53L7YAYP2qdAQ3e8RcYHqtV16g YWlhHWFC1NzU1Zob44p3D9jJ31xkSluuC9dKxN97UQkb4jfAC7bWiaBUatF92dAhMwXt wKBwuICQTSRmFYaOnem1e8PP6keCLu0uKbordKLey3j2HtKKab3Ru0P6Omz2GtcRmRIK 0zfpF5ZUlcSYfteLfD+GsbQ6M5usDtiFMpc7X+1+yHaLaDrFO5qo+Gdil/XdUYwqEP+q axsQ== X-Gm-Message-State: AOJu0YwoXExDnvq1t+iN0wXA1JaPKowqDtca2jCMIXUD54lQbKnGOoke /FQGQHWPoBofPkB79xgpbvt903L+G/j3jZZ6LgQxhUooX3oUFxUwdU1m X-Gm-Gg: AR+sD13PMynjRqp7BK6G6MYOy2X0JTwjwt+qulFqpos5M9RT9YwNRgQzyRaFtfux57m tqFFHaO+Mp8OD/tWFllnY2Im17Tax50vBQZJwlhC8tbZ5L1ovmz7R8qEH4vpq7sTD9cYWNoVFH3 jpwcyULp6fGVppFMaKIMzt7mVlar77g0QiPmtJiv6cbQ/XZfvSGwG3DM2FxuZhUg4bWrHLkRnRE NJa8pSjN8pV+Qs3kcFDK/5voHfQQpko04MKvsiD5WzGN/zGdTp+X9+REUwP3ABzejF/xEoh+py2 OukelM9dDQvvT0aW4w9yxEwU/oLs1C75jJ62DfBoLlLCtW1F6YL2HXKc6q2EWgKhWUsDo9c6hxQ DPqj4WB58W+XOWeDCs/FAHAs0k86U8nCoCQVLNLNkwzYk/2f2I/+n8g+XCzFdZLfPMr9xhVzErt ypjoEnGFH9tg== X-Received: by 2002:a5d:6f02:0:b0:47f:7154:ab20 with SMTP id ffacd0b85a97d-47f7154ae17mr8536055f8f.37.1784562057410; Mon, 20 Jul 2026 08:40:57 -0700 (PDT) Received: from [127.0.0.2] ([2a01:14:111:ccf0:e9c1:2f80:10a9:c708]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f67466e09sm32667936f8f.21.2026.07.20.08.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 08:40:56 -0700 (PDT) From: Diogo Silva Date: Mon, 20 Jul 2026 17:40:35 +0200 Subject: [PATCH v2 03/15] drm/tegra: remove dependency on DRM simple helpers MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260720-drm_simple_encoder_init-v2-3-5020b630668a@gmail.com> References: <20260720-drm_simple_encoder_init-v2-0-5020b630668a@gmail.com> In-Reply-To: <20260720-drm_simple_encoder_init-v2-0-5020b630668a@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 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 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/tegra/dsi.c | 16 +++++++++++++--- drivers/gpu/drm/tegra/rgb.c | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index e7fdd8c7ac12..3f818c195e9a 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -20,11 +20,11 @@ #include #include +#include #include #include #include #include -#include #include "dc.h" #include "drm.h" @@ -1055,6 +1055,10 @@ tegra_dsi_encoder_atomic_check(struct drm_encoder *encoder, return err; } +static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = { .disable = tegra_dsi_encoder_disable, .enable = tegra_dsi_encoder_enable, @@ -1078,8 +1082,14 @@ static int tegra_dsi_init(struct host1x_client *client) &tegra_dsi_connector_helper_funcs); dsi->output.connector.dpms = DRM_MODE_DPMS_OFF; - drm_simple_encoder_init(drm, &dsi->output.encoder, - DRM_MODE_ENCODER_DSI); + err = drm_encoder_init(drm, &dsi->output.encoder, + &tegra_dsi_encoder_funcs, + DRM_MODE_ENCODER_DSI, NULL); + if (err) { + drm_err(drm, "failed to initialize encoder: %d\n", err); + return err; + } + drm_encoder_helper_add(&dsi->output.encoder, &tegra_dsi_encoder_helper_funcs); diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c index e67fbb2362e6..bc1c93c7554c 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -9,7 +9,8 @@ #include #include -#include +#include +#include #include "drm.h" #include "dc.h" @@ -194,6 +195,10 @@ tegra_rgb_encoder_atomic_check(struct drm_encoder *encoder, return err; } +static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = { .disable = tegra_rgb_encoder_disable, .enable = tegra_rgb_encoder_enable, @@ -305,7 +310,13 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc) if (!dc->rgb) return -ENODEV; - drm_simple_encoder_init(drm, &output->encoder, DRM_MODE_ENCODER_LVDS); + err = drm_encoder_init(drm, &output->encoder, &tegra_rgb_encoder_funcs, + DRM_MODE_ENCODER_LVDS, NULL); + if (err) { + drm_err(drm, "failed to initialize encoder: %d\n", err); + return err; + } + drm_encoder_helper_add(&output->encoder, &tegra_rgb_encoder_helper_funcs); -- 2.54.0