From f884abe9ee0c3728867d2cd7f9084fa5e1ada115 Mon Sep 17 00:00:00 2001 From: Diogo Silva Date: Mon, 20 Jul 2026 17:40:40 +0200 Subject: [PATCH] drm/imx: remove dependency on DRM simple helpers The simple KMS helpers are deprecated because they only add an intermediate layer between drivers and atomic modesetting. Open-code drm_simple_encoder_init() by calling drm_encoder_init() directly and providing driver-local drm_encoder_funcs. Signed-off-by: Diogo Silva Signed-off-by: Thomas Zimmermann Reviewed-by: Thomas Zimmermann Link: https://patch.msgid.link/20260720-drm_simple_encoder_init-v2-8-5020b630668a@gmail.com --- drivers/gpu/drm/imx/dc/dc-kms.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/imx/dc/dc-kms.c b/drivers/gpu/drm/imx/dc/dc-kms.c index 0f8cfaf4c4d1..a9adcfc68b84 100644 --- a/drivers/gpu/drm/imx/dc/dc-kms.c +++ b/drivers/gpu/drm/imx/dc/dc-kms.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include "dc-de.h" @@ -30,6 +29,10 @@ static const struct drm_mode_config_funcs dc_drm_mode_config_funcs = { .atomic_commit = drm_atomic_helper_commit, }; +static const struct drm_encoder_funcs dc_kms_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static int dc_kms_init_encoder_per_crtc(struct dc_drm_device *dc_drm, int crtc_index) { @@ -55,7 +58,8 @@ static int dc_kms_init_encoder_per_crtc(struct dc_drm_device *dc_drm, } encoder = &dc_drm->encoder[crtc_index]; - ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_NONE); + ret = drm_encoder_init(drm, encoder, &dc_kms_encoder_funcs, + DRM_MODE_ENCODER_NONE, NULL); if (ret) { dev_err(dev, "failed to initialize encoder for CRTC%u: %d\n", crtc->index, ret);