From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 DCB03346FB0 for ; Sat, 18 Jul 2026 23:36:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417774; cv=none; b=KUaG3tD0Yw8cCB9JbQrXAFu9gPFpycdmptTQ/up9EEjArXB94AekU86fiPcVwxml8A07M1nvnT0yaBsngN2JJlFAC4NRVSkvwzF7uRs3QITnEwr9E0iGm6jkQfjfX9SOnvMLj1QeHbWYnO911Zwq9Nwvre8lXwldlJrsVonLF/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417774; c=relaxed/simple; bh=vUlV0bfkxAr1ke6u+O++/m3ul17qgcqKWxREUGJ4Esw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MDPnf8h7J3eIgOSdfWCoryQcT5a6D0JVEKMAWWOmzQY+/EvM1M2xsvMPhW9yNufcjWqW6iLn/yI6ZfZPSQAQF1/bbM1/v4ahOJSHCxaoPmdC0bq3VUOyHOxBIbZT6gVHJA3GKIhMJqoHtEty7lTWB25XWtEJgmBbEf81mAhNlK8= 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=k7uL6tKr; arc=none smtp.client-ip=209.85.128.53 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="k7uL6tKr" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-49554ebb87dso4773615e9.3 for ; Sat, 18 Jul 2026 16:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784417769; x=1785022569; darn=lists.linux.dev; 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=3FjNP86ptWMOuru/pKfvMOeLrB2j6SXLcAuojoL3wm4=; b=k7uL6tKrwyICWnkRLSjyX7j+YfI7ImOoYqPKjv5A+xPCa1mkYGw+dPwW09yOWCY1oe du+qUzdDy0nICNGAWCexPkdeapEdK566CQ3QqdaNN8LdRHMdbDN9MjU0ohRbk8a0+Tmo sLg7iiA2sF8p5HtEFlyBb589unhK7I3uYNRQJtGh3Q8zL3hBhzIrHJpvW90ABIfx7t+/ NwF0Wh+pQC5aaTT9rCBEsAzQM54jgW0q9YEfN2fiJKa3QOztW+ULfIgiPJ3zlhR9mmz6 MWCFeaByd3dQv1/U64pnlMP3FvpLQ81aJmGgUoMtyy5Nfr+N6C/l0C8f0GHYyHE2oQ5+ P2Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784417769; x=1785022569; 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=3FjNP86ptWMOuru/pKfvMOeLrB2j6SXLcAuojoL3wm4=; b=DB4PtkM3gLSxe7/KLAYrTGg6vJCCs0df3FbrxcOU3A0enJiyWUReI2/5foDdxLI3RD LfTN/wh59zrp5GWebikmjv61DQ+k4HDsCaKYNNozfC67muMJwFcdyrK7TdvHld09lBS0 N574HprIMVcu7aHH4z6t4cJe/GCJDn3vKQOB6R8UjXfi83NBF9fLUAebiBiJ1vBWY6aD msuphLtdaMZt+87QRiZVlcCTJPGu0ZnGNXioYB/T+Nbd+dlt71essTlY6GDa82Q8qbPT ihvt4B30f6OjFesynzxwcaI67oAIag6jMH44/Xn1nioSlOkX6UOkvFoaxC20zatjfwnD MWqg== X-Forwarded-Encrypted: i=1; AHgh+RrFy3Yonxtjd2PoEA2B4WGsDKZR8NiFO4eVRG7x4KhvFlOgDhyayWWldBXNfS5R95JxEB8T5RAdNhYow4MnfQ==@lists.linux.dev X-Gm-Message-State: AOJu0YwkE+/05fRkhDucexPVjbFCWfmj9OzGRFnWL44AN3Ye0IcvzCVt ylGBAIu+JXctxrkdwTM3l3udXG73M7DEys8Z1vjXpbuXlkNm28nIHnsF X-Gm-Gg: AfdE7cmhYwhdy17/tIjGacasXWRde6LQyWXekJX5TLF8ir5sxrlPqQiKDcGQdpGv9ZV ZVzD64w7yte3Laz61gn9zM1f33p1MIP1vb3iyTwfItqrRPP4CIYSD6yvvXzaF0W6vqkZAJOCiJt W7nCAnmj/AE9kHvLjcSxnu9pRct4Xkxb+Nro1TcMdSsnT1DLe2bzL1LTY4H56zWHwJGFUBE2zU1 49/k2M2CUtoX3WeVHnpTdmWf0tnp9CJPlb03Z5H9Ve+UotLlZB0y2ly/urwwsmqTBM9soTHhU4n fAjS+NZJrVX1GUHZcc68zIQ9Av/0+TPw8XwhkZb6g5MWn77d4v7L+QfLF7xtMKZ9fvOgBCw3dlU +Kutt9i5qBsM4KknfBo/RnQkkXgyKKgqoJet5xEJm8UFXqbgAEdFyNp693/7KymU+v7g8WHtElT pwrCfQblRnZgGPxZIx+bMA X-Received: by 2002:a7b:ce84:0:b0:495:4487:61af with SMTP id 5b1f17b1804b1-4954a51659emr61464735e9.36.1784417768965; Sat, 18 Jul 2026 16:36:08 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 16:36:07 -0700 (PDT) From: Diogo Silva Date: Sun, 19 Jul 2026 01:35:34 +0200 Subject: [PATCH 03/15] drm/tegra: remove dependency on DRM simple helpers Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev 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-3-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/tegra/dsi.c | 17 ++++++++++++++--- drivers/gpu/drm/tegra/rgb.c | 14 ++++++++++++-- 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..840e118716b2 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,15 @@ 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) { + dev_err(dsi->dev, "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..337925c30d67 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include "drm.h" #include "dc.h" @@ -194,6 +194,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 +309,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) { + dev_err(output->dev, "failed to initialize encoder: %d\n", err); + return err; + } + drm_encoder_helper_add(&output->encoder, &tegra_rgb_encoder_helper_funcs); -- 2.54.0