From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 6D3BF379EF7 for ; Mon, 29 Jun 2026 17:39:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782754769; cv=none; b=PnTeWsTfmjeeRgV+ejnedHvpgUd/Ac7f5aSa6R847N9dahEPry1qz1zq1YMJoBKbofY6FPZmoNlRrEruvp0y5K+E35tVFGZE2PHJiYNPgMIMXpsuA1P71BY30nPYyHD8wF1qNFuNkLjUuVZXwhMKyCJCTKV6HR+CdeygkYU2ER4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782754769; c=relaxed/simple; bh=12CQj9Kx4FxJFHyHeL9HLiH3OLUURb5MHEbon7nkz5s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Dw+B23844eHQqGYJXQLyzD4lTnGc1fmMj0ZLOoJt1T1RxdN1O4ETxzJzDsHAdi/sseHJQY4eB8e/W/HKh9EbnkIQU6CqoI/t7OlgO30BQgsd1oerFNfhJpgSXo/bUkTavXVrlM3Hzc6ooTNvaBoQq+VLziQBjvgzOHTk5OIR9WY= 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=jgxiqDYj; arc=none smtp.client-ip=209.85.208.49 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="jgxiqDYj" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-697763eeafcso6091971a12.3 for ; Mon, 29 Jun 2026 10:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782754767; x=1783359567; 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; bh=lieoZSrETeNqfqjggjcg7YjI6XZdYix99GC+0aKI1SE=; b=jgxiqDYjt+Sa4QE4KPK+ijYqktfco9LzYgG/yWcpVcF3NXgrLTL/+UzW/P36hxWov1 TeeaC8lKQEiR3ebbf+C5nSWvpUd2A4sHle06Pdjh3zTSKLvbSU5IhEMuk0NZVWVIl1Yh Ii0AmCCt7KjjqZnF0Y88RNShUVrOSiO3HV7u3FEyX+gi+bsbTKT01HNhusn7PyaS2Ukb UWZFMoExGmgpp+33o9Xu1WkDG23DdZriBpBhSrfpnd0qQ56l4n/gyekbxbT1nsukr2Po 2sUrh36/lTtsESpMgTNtgCOURNy8BcicU3HuU3m+HYa7Nj75Yab6aoGOf4IdY2NvsD/a xGDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782754767; x=1783359567; 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; bh=lieoZSrETeNqfqjggjcg7YjI6XZdYix99GC+0aKI1SE=; b=dYCFqleirXqPDoOUWZzL5RqFBXJnr0sc5CNjbkRlRW+58JI/Y+tBHGUNmWEoa2fizG DDPHsh3aQtM6dX8BcebrLAru4xVbiD/ANLJNUvqoSzjidHjrSgYfeM8BOjzQ7hcQFRc5 0tF/CxIO49eERGF12E73yhy2K1mVIqljeZf5pnbOjWf9wrS5WZfxy8H3aUEb7KrC+1yK uhZl7ZgPaMDJDcGRZd7S7ddOd+OxFbRo75owniLlvlLGFR1Zca6R5im0VT3Ufw5eSPPt jEjisDFbUeRLc7OBOku9wCU7PCzKvAaw+ORs02LcHLLZt8oFdaFuBhs6kBaFbT50eNoP h9/A== X-Gm-Message-State: AOJu0YyvH3O6A+wGLdOH2elNAnGsdBhFzmW3JZbRzgBvQfFlUyrVX4Nf WYjPDSy3h/4rfEG8BQH4sTzJYpwM8ygJW1kcEGQMLATclhSAe6vXKZgj X-Gm-Gg: AfdE7ckVUtNQ11gV0Gg0WbaHjCO77SPWb+rnEt56u8Jd8O5Up2p/hcvcsTGRAPJBQUd a78mJQ6QVMVORVjnXqb63JnCZC/JIhJW7NC2Bx5MYrT62M+E7LH0vOGx4P2SKgYhkFf75eZfg+M OMB1cW0rBLQcNSdXGJIVwfBSSFoR6EymEpeF7k6p8MnzC9GpvX3x63i9EaPt/npdkU3Mq5wm7Tx d+t0+nW9WBkAwtOcSNtQRgZO62VwY6dK3i94WSxtnK2M8S5aTkBzFUXRfeKppFPn5HBfoO1lIIs DApBgJgrxTWv01o7tKnQ88LCG+rCvMdf8v8V6HC1TsfBSzEt6WE3wZgZ4/h8cXJmhdNfB/eXZUM 8kcQpq0H5WfDtdquFvMqJm+zJ3ZJsSev8FSWqmUnh3oYwuncSfyvpavfvIRmqol0YoPlmKg/E90 SzHxWMm486siPvMwULLCl7L3LvvjGJ4t2ChU/MEqkqjTu7DQ== X-Received: by 2002:a05:6402:3908:b0:693:2a2:9e41 with SMTP id 4fb4d7f45d1cf-69879e26a3amr74630a12.19.1782754766463; Mon, 29 Jun 2026 10:39:26 -0700 (PDT) Received: from liam.home (233-51-98-95.ftth.glasoperator.nl. [95.98.51.233]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69858838d6bsm2943446a12.7.2026.06.29.10.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 10:39:26 -0700 (PDT) From: Liam Zuiderhoek To: mripard@kernel.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Liam Zuiderhoek Subject: [PATCH] GPU: drm: meson: inline call to drm_simple_encoder_init() Date: Mon, 29 Jun 2026 19:39:02 +0200 Message-ID: <20260629173902.29415-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