From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 DBD5B3793A6 for ; Sun, 31 May 2026 07:46:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780213610; cv=none; b=aq5fjGpnKv81MUkYuEEuKDL9I4jf66JmMBC7kERX8ExH7quqfO7KIU6u5y8w1L6uHh3KDCKxT+u2m4v2IrBIUqUUQB3ZqARrtGAqQ6KoZLGNSe3I+ESCDCcpTLTex6IbeMtdbSVV7z58o3tlTwN5RBR7SaXwGAL3BB4rqGUbUNw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780213610; c=relaxed/simple; bh=tX0c3d6EqeAW+gsXa7rb3jAHivJXxCGbq5s1athORoA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UTIsaIa0jzX4JxcdG+kRTRK5wokjQmhjjS+MjNn3M7OcUwyrotKvYQhDNg4Ll9EEBET5u7ImWDUFJusBSKiFGXM7EVq9vva/UAw09LW1oyqlLJN764n2rjX65fNZSvaSZDml/KXeGM4BEe0/o8u9ucw+F9UIbtoO+MJ9jvn4Ghg= 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=Og/vwVvj; arc=none smtp.client-ip=209.85.210.179 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="Og/vwVvj" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-8421f0e9c5bso505433b3a.3 for ; Sun, 31 May 2026 00:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780213607; x=1780818407; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pZgZXDapD3/D+twZe7T4nhGsVyTA1P2sNWQ93wpwZx8=; b=Og/vwVvjsWcAiNT8a+61Zq/ERekxN3QTQatsm7Zse5UAMc37H6ON3N3zYJPklqJSeN mv68LS69sTBOlE165y+P/tw16xZTYkbrgQhzZ1XdOdhnu5EJ/6oDnPzq84SqUsyzg2T0 okhDmYKtCbZ9r3ainXmbosB5oR9Iqn+lTLCSQch/zKkU3WPieT4AYpxUIQ9q1ZyXlNZ/ Q5wQEnG8GKAhcmI37C4mHoDLfOp7IzbEuLePbEdcagdWuliP4lTTwFcibBt3/k4+uoBD sa1blChwrKEp6QW/PIT85iXOE2TOlPTHdH+j9eEf0xbz3QJtUnTn1hw9NS4RFrovyofV RdZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780213607; x=1780818407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pZgZXDapD3/D+twZe7T4nhGsVyTA1P2sNWQ93wpwZx8=; b=gz93AyNUR5ViSxi4C9JJZ4C/hgsERmLl5aYb+vy6+AlkRpMztfRz5iwh7BKZTcSjlT HHo1bZZZVNIzroH2aCcmCYm0xxsZsTa+qq1q01GoXTpeWcyFATSOP/v2rPK+l882bHKZ TycU8rEpLf8LM9yeiBeqEsVKl5GAwEUQt5WCOokeXcRM2W8l4RTWIX9L6U2sxG6BenYN /CFasOScE4MBSqLlL4wnXHY+ZF2zWmLGPraA+7pLJpQEW6gYcfWJ6QUAI3/4qn5Y1DUN V5txRpsO3I3EJFth4XJP8tTekLriZMGrMA/VBFw4vx3THZoqDutmTuH9qTntEMCiY9Gl vl7w== X-Forwarded-Encrypted: i=1; AFNElJ8VWgmFqWjrJHN8TQuY8Pvk0+FXRrH+4+0491u1FSXHJntwQMbTOnsIwAoN6ZDmgRwF75s3csk6Hun6Nq4=@vger.kernel.org X-Gm-Message-State: AOJu0YzI7ZqMKNr+lYaJrsQTGn0bESN0Ebt2DNIXSnvOhG4jziSR8XGr Kw/FWnE1tVcYEf4Sxw9g859krYaGDTJ1GOYmRKQDMlzeYXtgJrUkzScv X-Gm-Gg: Acq92OG4cKoyHIw+irjUZ8OjdAMN4/wCueZM7A5hV0t+SMETBIeGiG5vavAUsOC9Bcy iE9sJwExLz7D1396Kylsf0FiI01IPbwW3UAUP/GiFBdfZzk1k/nq0qyoq8HQZqb6llhUkr7yKA+ cX1Gvr2rg17L1WTpWlCGGs4aZetIjvPYFK70uaMc/QiUcXFs3qD8ai5/01a3yzaH7VcnaDknzD/ tmv5mBq3PEtMD7dibNnppLlJCZEqzDM/ZxhYFbMh5VWQq7EmidBSDYa+8l9nsoVeZr2PmWzbU2X XBOQ0kN4HeeCJViITMhmFZ7RqGv+gkTOg23ERz/tyRgcYg5drXGbDPoZbRx79b2bfFXdWika4MD k5xVffiyOnleK3MJ8BKzdR2D+AFzSHsI8ds6kh/EDkJYtnj5iC9T/CjOPrkYLJlvK+XIMA5veI5 IWHS7jFYCQWUS0eVy419qdsH27W8+wooTTosgCQwoWhw== X-Received: by 2002:a05:6a00:4f93:b0:842:432e:b802 with SMTP id d2e1a72fcca58-842432ecadfmr1408991b3a.16.1780213606915; Sun, 31 May 2026 00:46:46 -0700 (PDT) Received: from Naman.Naman ([2401:4900:1f39:4c4a:1e56:d301:ce43:ac25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84246844780sm933636b3a.30.2026.05.31.00.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2026 00:46:46 -0700 (PDT) From: Naman Arora To: dri-devel@lists.freedesktop.org Cc: tzimmermann@suse.de, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch, neil.armstrong@linaro.org, khilman@baylibre.com, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Naman Arora Subject: [PATCH 4/6] drm/meson: Open-code drm_simple_encoder_init() in encoder_cvbs Date: Sun, 31 May 2026 13:16:25 +0530 Message-Id: <20260531074627.8936-1-namanarora029@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20260531073532.8609-1-namanarora029@gmail.com> References: <20260531073532.8609-1-namanarora029@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The helper drm_simple_encoder_init() is a thin wrapper around drm_encoder_init() with a simple destroy-only encoder funcs struct. Remove the dependency on drm_simple_kms_helper by open-coding the encoder initialization directly in the driver. Signed-off-by: Naman Arora --- drivers/gpu/drm/meson/meson_encoder_cvbs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c index 41071d6e0..496100ba2 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "meson_registers.h" #include "meson_vclk.h" @@ -218,6 +217,10 @@ static const struct drm_bridge_funcs meson_encoder_cvbs_bridge_funcs = { .atomic_reset = drm_atomic_helper_bridge_reset, }; +static const struct drm_encoder_funcs meson_encoder_cvbs_drm_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + int meson_encoder_cvbs_probe(struct meson_drm *priv) { struct drm_device *drm = priv->drm; @@ -257,8 +260,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_drm_encoder_funcs, + DRM_MODE_ENCODER_TVDAC, NULL); if (ret) return dev_err_probe(priv->dev, ret, "Failed to init CVBS encoder\n"); -- 2.20.1