From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 DDF6B377EC3 for ; Sun, 31 May 2026 07:47:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780213625; cv=none; b=b+xOVwNdgOSLYy5CDnz9BFI3+zz3M3957ynlnF2EaXNktyFowt9/2BDGHYusJdGpZE42M19CdsIzr2Ix85U4zekA14tsGFB4gjvSSnPPnQp439PmBaeTbSSByiq9T35csX1KvXCKkcqXZVWzjiznZF0RPmCRtdbQav3cnD6xK+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780213625; c=relaxed/simple; bh=RFQvkTsex3xVBRfIcvm0RS5sf/w03ttey67rugWQZ8U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g9TZofo+3vsnt/8hUi0jIHJH6OvmbFEjc18OHRyaY3hqk26HHaxWACIdfjllFVyZfj7yBe8BBvKvLzZJ/gs+sfko7Yo3z1cbOnsdj7CyRHZ1WdnT4fPbZpyZvUOrLDiSqfre469aKWcvY7hhrlqzTVuz05NgEoj0rCso+WDS4nk= 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=L+6IKIAw; arc=none smtp.client-ip=209.85.215.178 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="L+6IKIAw" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c858b392697so393587a12.3 for ; Sun, 31 May 2026 00:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780213623; x=1780818423; 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=ZZ904ivttfHdS60TN1sr5eWp6rmZB5uxbrG2ujQs++w=; b=L+6IKIAw5IaQ/D7PUnR4kcZNhHtVnehkItu2y3/iFP7xi4wSUYzaCD0XcZXd5X/MAs 78v7XA4g/H/aMUtUowy9NPfQJp8tPSRnhEgM3RKMJDUroPCenj4BOF9gPH9fqg1FmY9d 9dJCCS4nw6Czflp6alNSaINNgtViZgxI3txk7vTithsMbPGbi0zL8jwpYRpjJm/9Fqfd Zg0m/ijmmaKjzVag8+sTQ/nswPMQz/cyBhTl556O+4mZgZTPDKrrCbnkHsh6JxSCm+ca R2pdM9/g8LsIsiVmTD+wK8jx2qaYYGeEVoqQWQ4ca8M0Hg4nOKNgcMX1kvYW3bpQuJ5L y7WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780213623; x=1780818423; 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=ZZ904ivttfHdS60TN1sr5eWp6rmZB5uxbrG2ujQs++w=; b=aUqoWMTaL1fgBV8JMKtMIU1W3N3FENW9WIQVleJUFToU9EDZlkDL6fOtOlcMghMVmv 0nwLK0ss6HTpaQfjfHgvsmFerrf1BV+F3FZYHpsDD1P+K4jDLtP9vUHjh7LuqOX7hrl/ pfSPoCwdvBmVOiixfbj/MwU6soshH8tTGqSeGt6lqtWVCPeh+MrHxUVohAnzPan5T4oM Sf1HJM6XV4sJ05oy7NzU2/c8zt5RoyMFOeJsCYGRu77LceXvCm0YI6V2j17oF/CqDbNQ bJNnk7ywWCLsaH18ef1C/xyFzqt+1toR0F82mInOpK+JF7xjFpPmTvrOp5calaI3roAS IwKA== X-Forwarded-Encrypted: i=1; AFNElJ/hI6TUYBw1lP0B2PBHbws04/+6OY7NK1yKVtfvy73jDBFg6pWqhcHRmcRmCl3UTkcqM8xivS9gObzLO/w=@vger.kernel.org X-Gm-Message-State: AOJu0YxmRCy4f2mvSb+DFyIhMQF2LuPh1v++SwfGyJGlEI1p7TtVNAzj XZXdPkO3MF9XH3y5MtzzMmjfVcqwyxg32MMiqcZeAMtOI8bsh0yL6N3M X-Gm-Gg: Acq92OE19M22zzskzBdfTiXPufr5KC4ZNV6ep6d4dNqKBNGa9I6r6Dr1o++OzP2FwOj MIk14RPDbau3qoK+8J0ag2W9jbKBibafv7x7whPl2oDopE2GTtKQYqZ87zBnh5h62pyAF2TsHOi OiG+DumDDDnVvsFOoMWrrkCFf8Cvy1d0Gw7w083hdsX13P8rF59dgetTM/8f3DoSC8gPJ6mAxc5 dVgAYQrQajHugfQupzuBafeC8Z0VByKQD9yAUxbhf6CeRFfL5EaSOGeFILM/NaHwUBVZYErimbU UsNRQ5QECFFn5qEjtyYFi0fj6V01MPcWun/g1Q9RSVSPIA26kc3Czto8DnIKnvcSzHxYKbeYfuA 7zmZlgeaeSEOX+GUWXQmN0RPDMWB+4MKQE8220tz2vjBQN9Bev1PIbCCqDfXz6vg2/lwy9w0B5j rX26onZW6Ft0fCcp6SBsUVrOmWzv/0k60xRlX28gjmdg== X-Received: by 2002:a05:6a00:a211:b0:82d:162c:581f with SMTP id d2e1a72fcca58-84225a087c4mr5251686b3a.48.1780213623224; Sun, 31 May 2026 00:47:03 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2026 00:47:02 -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 6/6] drm/meson: Open-code drm_simple_encoder_init() in encoder_dsi Date: Sun, 31 May 2026 13:16:27 +0530 Message-Id: <20260531074627.8936-3-namanarora029@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20260531074627.8936-1-namanarora029@gmail.com> References: <20260531073532.8609-1-namanarora029@gmail.com> <20260531074627.8936-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_dsi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_encoder_dsi.c b/drivers/gpu/drm/meson/meson_encoder_dsi.c index eba246791..e14da1f71 100644 --- a/drivers/gpu/drm/meson/meson_encoder_dsi.c +++ b/drivers/gpu/drm/meson/meson_encoder_dsi.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -99,6 +98,10 @@ static const struct drm_bridge_funcs meson_encoder_dsi_bridge_funcs = { .atomic_reset = drm_atomic_helper_bridge_reset, }; +static const struct drm_encoder_funcs meson_encoder_dsi_drm_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + int meson_encoder_dsi_probe(struct meson_drm *priv) { struct meson_encoder_dsi *meson_encoder_dsi; @@ -133,8 +136,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_drm_encoder_funcs, + DRM_MODE_ENCODER_DSI, NULL); if (ret) return dev_err_probe(priv->dev, ret, "Failed to init DSI encoder\n"); -- 2.20.1