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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 83F29C4452B for ; Mon, 20 Jul 2026 15:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ITwMWTyjPOpmiBS75ZF02CenxzeBHARaB0ED7f6Tp6A=; b=hpWSftDBtzkoM58DxxYxh0pdDS 9mT4dypACBJeguXOize9ikOwv+rWQdECqZCajlfiW4ZHraHKXH0cxs1i+3avIruI6/iFU14CCgTdK 3b2qQ8pRv8Q00XIrRf9SChFoerfJXE9TangvCefZuvwlUqyUGj5nk4QzdYJC/6nx/l34NxfjntGKz dQCVzsc++b7LRfUu+MGcwgYThkGAI36c2JuNApLutDOwnYd6wqaTegLXOFnwjvJIlpX4ZlCH2pfgr jWTF/jHmGApAbBioZk8NiJvKhg+dRKGJ/bbFQFsOD6BWs2ZQLy8JMmHNSDfthJT+RZJ8oqMYQbiAX bbIP5Yww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wlq7h-00000007Eq6-2xwC; Mon, 20 Jul 2026 15:41:41 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wlq7d-00000007EiC-1y14 for linux-mediatek@lists.infradead.org; Mon, 20 Jul 2026 15:41:39 +0000 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-4728c12ba97so5146073f8f.0 for ; Mon, 20 Jul 2026 08:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784562096; x=1785166896; darn=lists.infradead.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=ITwMWTyjPOpmiBS75ZF02CenxzeBHARaB0ED7f6Tp6A=; b=IlE2BeVVzY7mGS9UZpG8DJr4ZIeBMSiTytKy8utatdvmRIaMfuuty1lXuh5cGuC3yM wtm/2Vgk2oTvoiGbBIM332KS1mpxPF0sU4pHu/OF0VnR9mr6b6fDLubnnjBlqkdIde5H gRcmPNhl0KKEosv079lPZljsk5Em9bHdo5RkKynRFjVLsGycjksuQcV503NkOBHh9sq5 jrs9jsInL+oYUWZdKSeKCsBcvl+Ux748J6lJ/hSubhw9/BW22iQaVNLhVJ7s1p5jAzP0 BrOoK++N9MY7MnRNz9wE7koJSq2HKgeqEgxQ+e9YfxpItAa+RCBbqu3W720knQF6SkGM vkYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784562096; x=1785166896; 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=ITwMWTyjPOpmiBS75ZF02CenxzeBHARaB0ED7f6Tp6A=; b=aZ7oh3fOIO0OpzAmjh1YiVMlTFU1Sr6S1kWeOWBIZoiQRYQWD8P8AphAz+wAeIf1b/ HdAV++GqvPuHnKasspltLp0UYzM2CYeexB0Lwxq15RH/+jZHvIiEhsfj534ea+Elr4Cm SB8sj1a6oK2ozfnh1X1tn9dvLCd5JYLGgjMktfUne3EBL9QUwu6Q6ScIrPJBeG52xPg3 fO2QxQVXS5vbMxe3swaNI366H2gNfG6ma02H0Uon/FXcEMy8XMCoPW2O0MPr3SyMh/MU r+OGkc7R8XMO5gp3USCcOt1thDXd/RfGmU1Jza9pwGRVv+IPHyd6x/EbW+MCEuOWQaKw bhZw== X-Forwarded-Encrypted: i=1; AHgh+Rrx2g9DfYRQ1vUiVS0VzP2ZpdRCsLFoqpmTvh91i6ela7/F4aXWpn6VVb/kW8wyMNyBqq9XN4JAoirRrfiiSg==@lists.infradead.org X-Gm-Message-State: AOJu0YzlneS+/FhcNBSSwbWCaFZ9TkCCap60gNcKeVrz6aT+6Efa9VnW A07AR6xqkUUgo8sx4Dbzzo0JhdjYEmjbibwr+gXESULzO7ynkGZOy8eb X-Gm-Gg: AR+sD12r/rUQkKEQod8ssM4SyvoCjrAwaluKT70W3wVyaFwxkzUqSS5lejNTFs9GK3g oNpiR+KIhimCDzM4Kz6/W8gWoQJuWRGuISt+qmcmibqIvbujvmc2vWdI3pP/avZ9WHFF7yqa8wT Jy2BtsbKLM+oOXvSPV+1htpyGhT2oPhtxAZwN5Xs8DHHcwM/s4KFZX3CSodt+B8blFoLkUuU2vQ 0BlZYYJD/LEhAq5YZslKm9dBBjLm62FSL7vUADuTC5Jqq4IeGEtZ9q4arpvt0TwzsI/lhtiYuOr u2MbILFw8y45K1AA8rykWzu2suPcSyroCxw2KlSjwxhlSRbHM5Vip0LwmIZDSJwCQ/dfEf5KiSD KVWtHLtN0b1X0P9et8IzFS1krehaPEDC7emokQ4TD7711fjFBI3OEwG0QTlfI2xpqeSdA/+sEx7 mfr113+FLrBo5r1sybSMm5 X-Received: by 2002:a05:6000:18a6:b0:47f:6f98:4993 with SMTP id ffacd0b85a97d-47f6f984b87mr10186539f8f.29.1784562095536; Mon, 20 Jul 2026 08:41:35 -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.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 08:41:35 -0700 (PDT) From: Diogo Silva Date: Mon, 20 Jul 2026 17:40:45 +0200 Subject: [PATCH v2 13/15] drm/meson: 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-13-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260720_084137_568467_138775FF X-CRM114-Status: GOOD ( 12.04 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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. Signed-off-by: Diogo Silva --- drivers/gpu/drm/meson/meson_encoder_cvbs.c | 11 ++++++++--- drivers/gpu/drm/meson/meson_encoder_dsi.c | 11 ++++++++--- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c index 22cacb1660c4..cdb84d2283f8 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c @@ -17,8 +17,8 @@ #include #include #include +#include #include -#include #include "meson_registers.h" #include "meson_vclk.h" @@ -218,6 +218,10 @@ static const struct drm_bridge_funcs meson_encoder_cvbs_bridge_funcs = { .atomic_create_state = drm_atomic_helper_bridge_create_state, }; +static const struct drm_encoder_funcs meson_encoder_cvbs_funcs = { + .destroy = drm_encoder_cleanup, +}; + int meson_encoder_cvbs_probe(struct meson_drm *priv) { struct drm_device *drm = priv->drm; @@ -257,8 +261,9 @@ int meson_encoder_cvbs_probe(struct meson_drm *priv) meson_encoder_cvbs->priv = priv; /* Encoder */ - ret = drm_simple_encoder_init(priv->drm, &meson_encoder_cvbs->encoder, - DRM_MODE_ENCODER_TVDAC); + ret = drm_encoder_init(priv->drm, &meson_encoder_cvbs->encoder, + &meson_encoder_cvbs_funcs, + DRM_MODE_ENCODER_TVDAC, NULL); if (ret) return dev_err_probe(priv->dev, ret, "Failed to init CVBS encoder\n"); diff --git a/drivers/gpu/drm/meson/meson_encoder_dsi.c b/drivers/gpu/drm/meson/meson_encoder_dsi.c index 3e422b612f74..faa309cb97a6 100644 --- a/drivers/gpu/drm/meson/meson_encoder_dsi.c +++ b/drivers/gpu/drm/meson/meson_encoder_dsi.c @@ -10,10 +10,10 @@ #include #include -#include #include #include #include +#include #include #include "meson_drv.h" @@ -99,6 +99,10 @@ static const struct drm_bridge_funcs meson_encoder_dsi_bridge_funcs = { .atomic_create_state = drm_atomic_helper_bridge_create_state, }; +static const struct drm_encoder_funcs meson_encoder_dsi_funcs = { + .destroy = drm_encoder_cleanup, +}; + int meson_encoder_dsi_probe(struct meson_drm *priv) { struct meson_encoder_dsi *meson_encoder_dsi; @@ -133,8 +137,9 @@ int meson_encoder_dsi_probe(struct meson_drm *priv) meson_encoder_dsi->priv = priv; /* Encoder */ - ret = drm_simple_encoder_init(priv->drm, &meson_encoder_dsi->encoder, - DRM_MODE_ENCODER_DSI); + ret = drm_encoder_init(priv->drm, &meson_encoder_dsi->encoder, + &meson_encoder_dsi_funcs, DRM_MODE_ENCODER_DSI, + NULL); if (ret) return dev_err_probe(priv->dev, ret, "Failed to init DSI encoder\n"); diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c index 0c7a72cb514a..c4355c5cc340 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -23,8 +23,8 @@ #include #include #include +#include #include -#include #include #include @@ -369,6 +369,10 @@ static const struct drm_bridge_funcs meson_encoder_hdmi_bridge_funcs = { .atomic_create_state = drm_atomic_helper_bridge_create_state, }; +static const struct drm_encoder_funcs meson_encoder_hdmi_funcs = { + .destroy = drm_encoder_cleanup, +}; + int meson_encoder_hdmi_probe(struct meson_drm *priv) { struct meson_encoder_hdmi *meson_encoder_hdmi; @@ -407,8 +411,9 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) meson_encoder_hdmi->priv = priv; /* Encoder */ - ret = drm_simple_encoder_init(priv->drm, &meson_encoder_hdmi->encoder, - DRM_MODE_ENCODER_TMDS); + ret = drm_encoder_init(priv->drm, &meson_encoder_hdmi->encoder, + &meson_encoder_hdmi_funcs, + DRM_MODE_ENCODER_TMDS, NULL); if (ret) { dev_err_probe(priv->dev, ret, "Failed to init HDMI encoder\n"); goto err_put_node; -- 2.54.0