From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 4FBDC3793A9 for ; Sun, 31 May 2026 07:46:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780213617; cv=none; b=Vh225Lxnj79E/OOX3UVoif3HtvL2OSn35/Z18WX7FvOMbQynHXGgaEEJyquusuppq8Le2t64VjI1DhdRWT4goaUuGBIy/W0SdB+CZaa+Y9J15gHuvqIroAy78IFu1hGlIzi6PFlhd9x4CPBogNVsPAI6Rb4qooEGwqn6siQLmic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780213617; c=relaxed/simple; bh=3XLQQb0/vldL0ZnC8EQcRq9Kk5gpFiTO77DDAu853+Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p7EIRq9xb5AyJ5mAQ/NLg3ZtFtcEXUGHAtX+8C/xuXXhvitjcMkZhGMaWjD/fCxTwpF3lA/LgCJX26wQ6+NYIRpSwV8j3Wsf6CvqUEpayd44itSHIu8ptqL6wXVe4YUzHDPTDK+MNKdraekhQV6HZscWiKbupB1V0o9ChnCCo6A= 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=YKFjnEZt; arc=none smtp.client-ip=209.85.210.173 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="YKFjnEZt" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-8422f395a4aso383879b3a.0 for ; Sun, 31 May 2026 00:46:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780213615; x=1780818415; 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=hl7/bz2Wt6XngU1VBihi/m8AgI7wZRM8055uUzVh3Uc=; b=YKFjnEZtNGhc6nGmFJdkaq5spbIEYqgjssqxwGd9eBvON20YdJn35Azybiup2NER2C uBHfdm5L8FWv1mxqNPh4Lyo8L2TCWI8tyy1puT9g8PiO+X893wtjO5Wf0/MQ/825/RX7 VfV/KH0HU0HN9GlKnTEqB/SpV/K9yaFCM53Nj5iXF/TUoEisKxi6nAIi1j29ctjtkDGw 9705TQWOgZJzJEWPu3G9/D4d26NGDcJ2Dk8+h4eQc3RKHrkY0zI7G5KWfL9kCWQfKt0u eG2YiKTi5v8GHFyjHUTtNzeSMVQBgETtmAtymEU78ahlTKis2eOPXlwWjijqBPcT+ltc GaQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780213615; x=1780818415; 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=hl7/bz2Wt6XngU1VBihi/m8AgI7wZRM8055uUzVh3Uc=; b=c20xCJGpETzTi+9LrzRXZbc8RpTv0ug0irbAVwi7JPqM/RTqYgc25XSucJsaR25ZA6 6AORq8Df8J7wf8jxsepU5ZwmC1RekZcIksCYpfAURqTbllBFMlJCP4Yr4rgZq37AIKmC JAjBqS/yFWH/LweXpt66pgRQ3DIHEIktD2xpGZvFMPaKHPKSvByUg2RghFwUYhiYBO8+ 35Z//xfjJYad8XA0lkC8ETcdJewz1JbUV31NvO4hM38XFT7iulNZkGdsI7rFQGz0yv4p sVPBIhWIC8O3/9ZekYtZxLSMXPeXxa0bqnccJYsO8qXIKyR3A3oYd8J1RmGSN4OyQ+gH tAIA== X-Forwarded-Encrypted: i=1; AFNElJ/u4qNBYQgTsRhlYNVuf/5XXrGLzvgYXFpbf+zUVPJQrXZPYzydp8Jj4om0MfgnGveHWppXchVorYhF0qc=@vger.kernel.org X-Gm-Message-State: AOJu0YyZn2efSNQdhvxVdF0cCvnwGYjB906dGc3I26NAvGpyaywoFACS jCM/pn6+V92gRCgLki6lvkbqwDPpZUTGsVJx4GyO6myms7XRf3uy2FK19KvMxjhZ X-Gm-Gg: Acq92OHxiXAMZCapoQ5o2LtmdAZKQMnRmBNIrbrewXpcJfr3KzhJrAdyOzjDcBV+Amm TizPbs+y418yeqCqhsK873tntUxkBT1xf/KOVhnb4M0zXOU4SbWsdx4Rpynl9MulML+UEEDZl/m nqHUL1HA/c0EaNlbaQy5wEu9PZb9ihoTpQ9XdRKDfPcHFGL0S5qKfH18fXqwwxe9SVL+7NAfTrz ai2wWTRyV0q9VE27soWdj4m1BbB4JHS3vluhRGlBneM92cJjJArBNylAo29ilzi7zlQqeszTHBO u9S+kbnPUs1FjiOlTTtvvjIRFW2IFY3KXGpo9+N02gi//BXGHEZbDoB2qf6/OqFhh7YeDA0OzPc GjEkIN1gc0+ezhHmPyJz5YqvRlO3LrbJgM0qSJWHpqxxA6hDgQjtxuU0K1ALjfceHhd5lZ7hLm7 JGrnv65ImEyRmJfZ6AV9oN6+BjWiW9ZteYlcOHDXAuzA== X-Received: by 2002:a05:6a00:1d06:b0:82f:684a:84ea with SMTP id d2e1a72fcca58-842258ccae9mr4697323b3a.13.1780213615399; Sun, 31 May 2026 00:46:55 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2026 00:46:54 -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 5/6] drm/meson: Open-code drm_simple_encoder_init() in encoder_hdmi Date: Sun, 31 May 2026 13:16:26 +0530 Message-Id: <20260531074627.8936-2-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_hdmi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c index 1abb0572b..0a0ec34e3 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -369,6 +368,10 @@ static const struct drm_bridge_funcs meson_encoder_hdmi_bridge_funcs = { .atomic_reset = drm_atomic_helper_bridge_reset, }; +static const struct drm_encoder_funcs meson_encoder_hdmi_drm_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + int meson_encoder_hdmi_probe(struct meson_drm *priv) { struct meson_encoder_hdmi *meson_encoder_hdmi; @@ -407,8 +410,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, + &meson_encoder_hdmi_drm_encoder_funcs, + DRM_MODE_ENCODER_TMDS, NULL); if (ret) { dev_err_probe(priv->dev, ret, "Failed to init HDMI encoder\n"); goto err_put_node; -- 2.20.1