From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 5B283235358 for ; Mon, 22 Jun 2026 19:46:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782157620; cv=none; b=jvE3PmwkzG4itgiMQNo2Ze9BCO61jcom9xdMbdHaoNqSc2r/CtQ7okEQ8ThK4XmU3mWaz0bn+dVNxa7rZ1kKvx40bmccfmARu2YZ+JQ7Kq0bX7FU4LXazbJjRiJgX5nWh1NTEVaD43RVlxtujtoVjBva+oTqhnwGaB4dnScnW6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782157620; c=relaxed/simple; bh=12CQj9Kx4FxJFHyHeL9HLiH3OLUURb5MHEbon7nkz5s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SFsZ1qVenQr90bZeoPArMjqCRuQK97JdBZV1JVv9TFMdCM2U5DcQ6k1CSevVYUyeaDofo6A9+BVinPJozF6RnFeHSHDGvvdxQshp7MGyx2l3gsvB3EatZARI6ZoeNAb8UuzRsuBD3Z30/x0h1a+H+rZUHIHZCkZzPLMJHS3jCDg= 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=Am6gFTBJ; arc=none smtp.client-ip=209.85.218.53 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="Am6gFTBJ" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-c07fd4dc2c8so510488166b.1 for ; Mon, 22 Jun 2026 12:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782157618; x=1782762418; 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=Am6gFTBJdl4I+f8P5vEcPCRQCFhKjX4ayJSXspTpmPFBFqBAVooSDRVs41xGMr/HqB VyoDS/klBYwGzpk17zbRtG7dWl83ODIpqDcL77N8xyNe1QXsT33MU/9+TxLlPCHPYHyw AZr56GaXfJMLtFTHEHMny79FdpYNTEW2FZMVBYlWvGa2TCzRdxC78ENmJwbMLky2M0jk oWqflGubjOfVboetmolqQAihjheoxMKCEPN7Y7SL+XqR/1mHw2Q/VOJAVNILUZaignXa 0ph5XzuSB0AGJWbC6ieqQ6K6uh6pVjdLvN52PZIfk03CMnv2xRpIX+fQZWEkYiREInfp q5Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782157618; x=1782762418; 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=CHNTAPmQcPT6tSJChQvvxQvCkXsvbBeEQi7W8JV+t+gJOAnCiD4Gz0JqncAhKwkqNO 127l68VNtw/JweObEvxieXdnZtmBKqmEyCn1rg3iGpnb1TTX+4eml4MZVQ5LUIkCc88p jpM0b4qAzyuU8wBU6X64FAFEKS5O7fubMVVOSsPH+r7bnDl+BrLk6ubMmWBJVpVHoV75 o9nv3h74qNm6NqLMdIKd9D28Xe/H8jA1uY2Ly270ammsHPYEPE22e4N8kmt+gbuqChMo JBpK9Q9ExOjLEgoPt3ZHLqxemaMYophol8Jv8t3bZ3opL7Pn4s4xD4HBk42zjSs0uv1V cMeg== X-Gm-Message-State: AOJu0Yx1lzwu7DuJsNaAOYYQUL/qtuyeWO7M2Qbqz9Ua6gWjc4O7Efot IgbKePXc0IUEnEyTmMCbu6cCzXdA6xCnrJozmqnQM0/cH0fJ+wut0p3Rr3xHDqRggTM= X-Gm-Gg: AfdE7cmh28Iohs0g0ipp6AIHq22l+R1am3zgRXU+Ib6NeljarcvfMUripb+OArCAxh+ eKiGPTO59I4snWoPoTWCbq6VoAhdskvOiNXiqUJ1Od4wcq+gd58n7pqlUjLzFWIXe1jPR5N2ze4 YenjWygIhGUZ+tQzQQbURdP5SvcuZtjd9r+iD3eb5f573nmc18K5ZW670el0zw2rJyz978RKfDQ oVltjLbd1KgjFqXQbuIIsKHZ8v7b2dtushIoDApmwb6cd1ukZ7fN288GTs15Jca9jLCrnqgDMXU ADfqY1Z+K6IP9mO4qtplzORRgif+B8QIk9uX8k6J9Wr317fukkI5KCW3C8tn8kIIr+hqyNqgPjj R6CoR//vtZHcXjQjfrHUIxfGhIdRN6TtVoC4h+XOqXelzJcUbWv24y9rQi6GQ5NrRJB1NAJ82oW 86h+wxzo+6giVvls1NHF50ApedtmJq2vpM0ojkUxYBRw+uaw== X-Received: by 2002:a17:906:4fd1:b0:bea:4a9b:27e3 with SMTP id a640c23a62f3a-c097adb77eemr849187866b.2.1782157617559; Mon, 22 Jun 2026 12:46:57 -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-69796c10dbasm2565856a12.8.2026.06.22.12.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:46:57 -0700 (PDT) From: Liam Zuiderhoek To: tzimmermann@suse.de 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, 22 Jun 2026 21:46:49 +0200 Message-ID: <20260622194649.218419-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