From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 4BC3237C932 for ; Sat, 18 Jul 2026 23:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417806; cv=none; b=nc/OvIPJlC7Z5AEiiy4ihj2scS/2PvG1XACHh2ykVzF4Jm4WRxTVs5z0P/oF7FqFJ2Yvb2IFC2LL4IRqpzoMYdfiXLFfW+6iY0mja6Gy8f8skn5nh7s3VnJYPRMHawtfU3baXdiy4tuaQJFJTo6zTU0jByKcXmsECI385s8n3zw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784417806; c=relaxed/simple; bh=0WsQRBQILDRGD9A8dPkA4+m9eQEodKM+eJPiDyQ5lmM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=juks3WNISkMheAMq80qt9wWxR+jeu9qJcSeEyz/xyoRG7NSAp34wdNiSwH/yRnUques5O/18UnQ75MwXVg7attvXzLeYyvUf4Gvr8Kc+O0IdgGQ+EORuf9dypNFJQ9hLay1JGVEYWykHS/36uk8L3VuUgPPI2oHaSz2sixJemYo= 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=S9KP2UAS; arc=none smtp.client-ip=209.85.128.52 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="S9KP2UAS" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-49545ba3d4eso13190855e9.3 for ; Sat, 18 Jul 2026 16:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784417802; x=1785022602; 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=ITwMWTyjPOpmiBS75ZF02CenxzeBHARaB0ED7f6Tp6A=; b=S9KP2UASxbSOgIUXmz/+azctDDA50XVh2wVJ/BgH5Fye2thU9vF4gsOFT5fMZxFh+X lFPRrPtM/N8qq6RUtbRrWh5iN1lgZA9ssqUyYt5Jve1+D8AXt7lihuSwO2/tRbCEdLb/ L2iFaoLW7y7nkQ/3ICx0vA2Ujnjke/1fyfDu7xOQfzJQelKLgvYKrVtktvLJGvj4Qb6E LYLlO0DXpnQAt8HT3L2CNEkWl68pUiMsCs9MhC71gaJqGR7U/9I84NBDfjXlE1L6Lhim iMjbGariRw9EI69DIsQn1MZPe5+7Sk6T5zYb7rgJOgcuZOD6GxentxaiCL++n7cYO+oz hgcA== 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=oeRB/nNM37PQby59Wdzfx1Sa3jGyWKqC8qpAVd2rfT/8Yi+XcaJEhz6EYin72L4uk/ MJc3vRjBMZodyA12OGDWBhgWNzeYrbUnyrrGse/MQ+FNk5XPExC+4fI2GhM6HnQz7ofL dZ5QO2dYm8RpNhRi/SdjNt8bHcO2sdARKxhEkYpX/TSG55nU9Q553ZBCWDQHXfFbydEt O148PZuBaW1uJFJ9TUNeoyIhuzvkjgL/8wUl5VtEz7JUdbRcp3O4nIs8ypvblW7cEnwG qzjm6C6u8L7iNqOQv+5mV63vtZTk934ysjMxvCezN51hbdHT6zS8nNvM3KvuDpe75nLl +zHA== X-Forwarded-Encrypted: i=1; AHgh+Rpl9KuhWz4GF84ZADsTj47UEUxILQ/luAgmT/6Xdo6bDzumQECjbUkGIyPVIApMaLaDkDVHExZvQNGXwAlQcg==@lists.linux.dev X-Gm-Message-State: AOJu0Yy6qj09u2RdKyabacgEKpTgjdwAC2mTmyR4Hs8xuog+5ASZeI+Q IN1z2V5IxSmpvw6jOeNRU2sJKCpd1no8Tg20WSOWkuZadi2oWQH6SAk0 X-Gm-Gg: AfdE7ckyJGRprskRyiIbjTHWPt3bu8fteyMx27syxJE9FztzMpUy69nH599YBrHjFyV 9/VTACyDIIxMuBhnidNXm57V/NiUuP5+mU+/zfFdpA+yCfoSs0BY1t3MOWTTuv8eWg7Zol8sy4R xke9CMZeoaDAeTJ/O9qydO5+9X5/8Q4LEnGTjLc+HtXE6Pq6f/2QU3bH1UflU0xHq9OAnx7cikW tH7Oto8kXqAE3mGlwLc4SVeGRHimsC5LUkbRfaqxTVTP3vllw/u91CI+nSwRFx/lSXSJScxjk+x QpETW8F/7kfhkD8S5b0/CW54Wqa0RYrbYj1LGznbRHgi4Dci07mJ3+SpcQzLJHFj87XiRHrHTOQ UhH/mCPjN3YM2L4KuJ8+YMclQ7SdRjT1rzfj88sl47MxRFyIAMR4LLJm8Qf057cGE8lzEd0R8WV HE636vjiOmww== 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 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-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 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