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 BC808C4450A for ; Sat, 18 Jul 2026 23:36:47 +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=o4I4n4M5YQ1TcGej0dempLmlBW AHPJxQczQaDcXdhMQKRnUnzU2fQ5MC7Vxf9KqtumPZKGrRcnNgtAsdC3muKxEK+B93A4gLK/Kjyfx Vc7Z7SvpwY7/8rcD5W5m9PVqpVw7rEnu2i7rEFVp0XvZFbQi6B5Afo6Eo+MUj3HD8MAx5DV7ZmLqY fMghDCQADhQKKL/PpBOZkIGt0Mqliv/tPIGp8swBmukR0PuiOcouvFwH1lIweLnNOegJF8gQnrHYT kX52F1mBOxe6kP06aReZN2GkfoSK+dBWDDsBUnBHlTEdsl8K9olXEEbvewFrCwL+36JGd3p31Y9AF Sl7Eqvnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wlEaM-00000004cOo-3pys; Sat, 18 Jul 2026 23:36:46 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wlEaK-00000004cK6-0XkI for linux-mediatek@lists.infradead.org; Sat, 18 Jul 2026 23:36:45 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-495590dde14so1123565e9.0 for ; Sat, 18 Jul 2026 16:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784417802; x=1785022602; 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=NOy+aUeFo4OW1ls2iotYEcXrxRIzyqPoYWuKKHcBiEgftf6hzR6JauLIUGG212AYGy KpgrccP0p+GHQmBB9qlEne4gFL/GgMGFWSZkL3h4cK7+FBwa55jX0VZ89n8c08eq8Z4J SJ/saT/IM/lmcGoM9IbeKjD7yR5rQPCHj/J8lVLSeaf5mYEKhBCB/u5tiQd25p674p8J nKV+UPGe08RAIbCBvPm+/9WVVbBPEss+I6byblBR5CUwccyRszTtfkDo1pStM1oSL34j httoUsf9rjSvyXe5KFIRKU6VrOnWxMtBXxc51oyPvNmMdWLupBpg1QwD6RlKJiuxR2qq Pvow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784417802; x=1785022602; 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=rj1m+Uj2/7+weQXI48sWO2VjWbT4aHvz1hcYs1TF8YZmfbVEp423Dceof+gptinFrj 3xj8kmIHAI7Eb16vCF72uSHbr/p12I9ymz9b8Ok6quWaWT9q8HAulbcrp7lvZiXr+zZs xi8xDczOtPXv9barYR56eYbVVu+n1gHHjGN3gN+l6VR91QTTkuYHtzniPsidW+fk5J8o WjWLGLklUwxYNJGMPzkH3ITXyDTcm4LU0XGaxY5MQc2619NMm8RkMaXnzErSKO1AiAfl SM2pOemTA9x5m4OgRQBhAm21pRWWqYKxqFgQPWlcyBp5ilnYTsyIFkYe1IJsfY0BT13p pNog== X-Forwarded-Encrypted: i=1; AHgh+RoCOwVldCaPeTwS9cfzZkgWQ14XAv0bMogGlHDP9xdk8tcal0wFhjzC+RSaHcqbdDoWO5Jlz5yV2g13ATCavQ==@lists.infradead.org X-Gm-Message-State: AOJu0Yzju3JSKP4ECAKBQfM3RCpv8o/bEDhBZpr11YaE5RZ4UhsqMhbN 9vuPz4uVdiznHB8HG8YFowo47lfi8FLOu8w/ZQ1NiDygjIoBd58QmpZY X-Gm-Gg: AfdE7cnMoAuRLZmIh5Josa4nir3Srf7tOhBrvaCGADgK8q1JilK5QzG9l/po4DZ85CV 57pvJwKCSIG+n4n664Xj7iV3d5myHd7cCuKyMQoeWcxn+s+7Wznvbi6e2bSXnlsCOD9IR4MnJqX MjsYi9c0ifg+ozyNHFbQqZTvPfDoIEjOkDZT8au1OXI4xpgB6LiR3sdxZn6bP6oqP49XMRDEcvt FaBz3IC1BtouKYBrlkbOKBOEaucyL7oCCg6+nPlP19i11HOpuqtbqnKtYHGmqBBZlYoLEiF2Y3I IEnJNlkhkxgQAOKwFLUwR7zMNaY9xaWgMn7pDA0OSDuyYo6sYEsRypMe8ocLbanJj9gtVulQnrb 4TtxuICMLyoA+JxtVaT7X8/0h7rXqsGDj/ty8mmg8Q2JMppOWleL5HuPsksNlKbbSraJ4T0CML9 W62npRx4AzPw== X-Received: by 2002:a05:600c:1509:b0:495:3f5e:e7a with SMTP id 5b1f17b1804b1-4954a51dee6mr63721895e9.34.1784417802374; Sat, 18 Jul 2026 16:36:42 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2026 16:36:41 -0700 (PDT) From: Diogo Silva Date: Sun, 19 Jul 2026 01:35:44 +0200 Subject: [PATCH 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: <20260719-drm_simple_encoder_init-v1-13-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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260718_163644_242941_F58E4C92 X-CRM114-Status: GOOD ( 11.91 ) 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