From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 4480D42DA2D for ; Mon, 20 Jul 2026 15:40:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784562062; cv=none; b=h6TU7/TGIIHopJ4tTgLHk8MhjLYNloti3DKYfKSdHca6+/YvSny7VOpR3FahP8D9m6xvQssUQKrqJiw/W9BKH0DvlqGeJl53QOYq7QyS1180sNyvisnb2b//91dGoOui73WIa+sP8RDWlLSPZxfxuLJgzRPBhedepVUK39lYXBo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784562062; c=relaxed/simple; bh=X02XAkJ/qvwOROXqM6gNmWkrEK5vY8c0WEEa1+0hPmU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Qmww5UJpkTckE25cO+c9XQVXLRJHwELEBWtGF69FxdxEIT+CuIbil54EsVZYwu0guSC9TlsT0va2N7CiBfcwjymW6dBfHevH+K4qa5pidT+zvs/VB8CAdEVump5Gw10vv/7CLFk3SirZwVNzguYRtF1KvWbD0Ul330ZR0N8GIq8= 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=SzUYvdSo; arc=none smtp.client-ip=209.85.221.54 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="SzUYvdSo" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-47c6e9a694bso5711542f8f.1 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=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=O7zJzFQDZ2ba/zKljTx71fkG4BHmnEG0mOPFGgp16IY=; b=SzUYvdSo3TPZZJ6wjyfuAwXtBMXTSjAzO/X45V/j+xmqa50j2FxcIQNilFenvrVC5T BEt8wwrgoPLik4ca0b/k92wWEiwjS9CZaKzDONsAaDNJkUsRstIYVcunVM2yGbrCDukd ctidm4j2ZZBlkThOMCKup0x2o9iJZpmIs4zIew2FU9DcgICgkXfmIn/girrcZkarteC+ s2TL6LHH/szM5g4GMq9oHYXbOD0VrIyMC2VD2jqLZ589g0u0vpyZzKOTkrLV9UPuC3hW HbERsdUGTsCA/lWsjzHALRAZ2ogKqqUZn0JGfb5XRbO1yUIxGYLg4gW4bWZs4rTQpCcP pgfQ== 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=VnzXAB2wCq6mt1lVPKny0omL2qEt7/TAcy3rDezV2cmhIrWg4ogXvvmr2i8TNOFDrF Wk9P17TwHlxsZaoJ13ZWLgX4me84M3fbSK/0XCQqlxRC3184x9kdS+PHjsxJzoLeKRAq aYlb8UA1tIsEh2iI9wyhEz4BJu5LhPwTmy4vU7vzdAVS05LKRW2tdjhAocl97VX+vn7z TVDfiqTKTAUtEvYve1SnWbaCi1JvBVvJH3ckZleQq5BQp0yjd1jfsD0smcSYtp7orM91 VyN9cmF03ChuZev38zPp2/3g0v7sptr7VcYrWe9+FRdO8T9iIQzyoCXlQuinoCOOpnrt OZXg== X-Forwarded-Encrypted: i=1; AHgh+RqD6YMdCytgHw/05nge/sHXKC7F6Z5/6iTRPbUoHAs+4ws/A/fLkQ79QKxaD6JLB97I+IRe3kT5QTiFzyk=@vger.kernel.org X-Gm-Message-State: AOJu0YyqJ3ipNUAW+uU5k9xqSAjfq0pwaTUOko0uaHXT+6oNtUg/Hd8v sfOow4jjXng6Ikz+j3LPEAGK3tB9LM2G4AfqEOBwCDyh6pLXwkPTBL/+ X-Gm-Gg: AR+sD108NpuvuP59ekExJTkxqskDQHtJjL5OFoqjjIr+bIfFub3n0iRFLrs2xcvPP7L dJqGRD+zk2Izv6aZ78SwuN6paqAKRG6RHjMpZQcs9MiVePCyxFaRfpwzAkMwewFQT37OkB6J8VU QPjg4ApQsiSpisGAiaIH5DaPuKgdgOthyvEoC1v3YXfeJmAPU0RpND6srfjCa8/qIa9TGQVXbwV yaVbrnV67VsQnyC5ViV9K0Bf+Ox9itRufc2oqcobjuGRkbMkdzHoAtgNUCDkJ59xXxsz2AlvwVJ n3JIIdjXEhsVImtpY/UeYCR9/Zcq+gUXYw7QpWVqUTOgEJjJLX6vTTbyaKWdvJxO2rGkpp+66Sy u6EiPXw7Q87dSdZMTa+4kuDU6f95TEM7f88S7BKwC3Fu2hSNTXVF4Tf/+s/PIsKSvEP7iyuARJu 1fOIQqcBllIg== 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 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: <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 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