From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 A2A363E0C42 for ; Thu, 9 Jul 2026 20:56:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783630565; cv=none; b=skA90/lrlPdqr/Ood5RsEvWc+LQ4lWaoQdtxlaZegujFFcMzHRuZkMGymGU/4PVOu9WOx9DnLEvMvCkwjuMSGZ/HydqsGNDAx+yhGCOhmiE6ic/U7cZkgMoaIJjWZV38KxOab5RyEAbe6MwnCjpQZ5cb5PA/kTAiVsuI4VG/j/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783630565; c=relaxed/simple; bh=12CQj9Kx4FxJFHyHeL9HLiH3OLUURb5MHEbon7nkz5s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=q6qEBinjq09+o8P5xM/giVXa37J7vj3N5UJsZ7rpmJwwHJz95F0fs8kP5cVK1qajJicGyNk+8st6Xi+LVepp62ibVqvDY55ZKhAfr5ab0Z6cO03XCu4gweq73G/vGQRCajmH5Sk1fxYS/hOhXbBnQNchJYAErJvwQn3dLHWtj0s= 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=H0Oz6BhZ; arc=none smtp.client-ip=209.85.218.44 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="H0Oz6BhZ" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-c15bf399d3bso37824766b.2 for ; Thu, 09 Jul 2026 13:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783630563; x=1784235363; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=lieoZSrETeNqfqjggjcg7YjI6XZdYix99GC+0aKI1SE=; b=H0Oz6BhZUSKsxWVHZUDCBNX1a+oLKZuyJM8WnEy7reuzqBUgy8OsdYmWbdl1cya5CK yTX1Vvo/zkWKHrm1q7cc+gojz1fNhv7I7z7AQ2TruSImSlkbxBg29KFROEOZNEeDQ32f XBKFEk648bdozLqOwm+Y5R6rjMCy2dUxm/XgPRE5KtN8KtSrJlMgM1hvHPjAjM1qLoXh oOY9O7AkkKopYGQ84sp4SgTPvOsvXhDqFGSMGZRRdBP5vrUGu4posiX2BExLseeTGo5I JJ1zyfLEhopHyI1Z9mstrO0yqt850LHRe4lpHwzuP+scQiNfiaEJHc2l6aC0UOur+BVY ts2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783630563; x=1784235363; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lieoZSrETeNqfqjggjcg7YjI6XZdYix99GC+0aKI1SE=; b=OzbC3mSyx2aZ4/PkVPOib/AQVa55ywqRZ45iLoIeo1uXVcFKpFj1anO/2Zf+9/wz0n jknbvlayg0OFAsQmd+DY7vLiS/lwR7KWAf7iD8857DocPljOvld+5gblGaeOSILGJnfO Y6N/RxnEs5AnSYcSZVFK1bOpDmIX+A6j1GIWUUOvAqv6cq0o11k3muyK1SMToVLWOIP/ Jfrku93z6zl46YZlaGbb6A/AifuP5mS/LBdmKGJFRyPCW5RCX70NwR1Wa09Demusr/tu 0yRS6c+eLIy1pex1NPvQEwdBq9dfCqqqioC4dMLarl0xdKA3ERkPWLkYbZpfI/H72q+f GSSw== X-Forwarded-Encrypted: i=1; AHgh+RqPv9zh9NoRoo4pgOO6ZZKKr6T1oitzxrhPPP2olQk2246PUYAdsv2bgBLnBD3MRAO1U/XoM3DXd3lm8ek=@vger.kernel.org X-Gm-Message-State: AOJu0YzHQekOSmQiBiW387SE3JOyTs8mTCrS/7arZiKOm9fz4veyHPtM qXIbCrfE7wT/Cf1lg5Cqi79f15iomPhj4axpK/sMqDSf0GFTVi/WHo+B X-Gm-Gg: AfdE7ck4NrPBnEHUqnZ445+pBcyBlPurLnkpE4IWkKXv1J4DIegStEvmZRuA3PKIB4h 7gvsOmT7UzaO+lmWhM390FaiQv3DqN9yF2lm/wq6RWDj2thETjkK5BmzBikdRoLJRPIAzwX7BeP +UINpQKhdwOMRSfyXeSMaXceQUJ2XB0aWJu+yp2N5R7q9XtWjTsjfvXklveDP16S2eJUo+EfVa6 hO8w4LmkV94McuVHxh0SBl85U59h/KUM1pRgzbqh1tqOyx8hfgbQ3FHj84fSkN3ouy3uvKarW0O JUVIQYoWcndM8j7Ou1e/ZD9ESyTohDIfVJpILNRxhevgRBmD1u/tcpQAb+d+90nHMmpmHYWWtg3 QsoHL+JXVpO8CByIXS/b1np4zKDtk0lRU7PkH/SK7ARj2QeRWWHchyU+rYQd3E62Mvme+zW34Po XV8fB2zMRDwXkbJt8LxCn2xTxAYyYKZSADVoTcJfE0H1FM/g== X-Received: by 2002:a17:907:3e11:b0:c15:f26a:342f with SMTP id a640c23a62f3a-c15f26a5b0bmr128439166b.23.1783630562908; Thu, 09 Jul 2026 13:56:02 -0700 (PDT) Received: from liam.home (233-51-98-95.ftth.glasoperator.nl. [95.98.51.233]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c15c63c04fbsm369352866b.23.2026.07.09.13.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 13:56:02 -0700 (PDT) From: Liam Zuiderhoek To: dri-devel@lists.freedesktop.org Cc: neil.armstrong@linaro.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, khilman@baylibre.com, jbrunet@baylibre.com, martin.blumenstingl@googlemail.com, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Liam Zuiderhoek Subject: [PATCH] GPU: drm: meson: inline call to drm_simple_encoder_init() Date: Thu, 9 Jul 2026 22:55:38 +0200 Message-ID: <20260709205538.73157-1-zuiderhoekl@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This commit inlines the function drm_simple_encoder_init for the meson driver. It replaces the simple encoder init call with drm_encoder_init and a custom cleanup struct. Signed-off-by: Liam Zuiderhoek --- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c index 55c0601df3c6..0dd3a76ad959 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -44,6 +44,10 @@ struct meson_encoder_hdmi { struct cec_notifier *cec_notifier; }; +static const struct drm_encoder_funcs drm_simple_encoder_funcs_cleanup = { + .destroy = drm_encoder_cleanup, +}; + #define bridge_to_meson_encoder_hdmi(x) \ container_of(x, struct meson_encoder_hdmi, bridge) @@ -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, + &drm_simple_encoder_funcs_cleanup, + DRM_MODE_ENCODER_TMDS, NULL); if (ret) { dev_err_probe(priv->dev, ret, "Failed to init HDMI encoder\n"); goto err_put_node; -- 2.43.0