From: Favilances Noir <favilances@proton.me>

drm_simple_encoder_init() wraps drm_encoder_init().

It uses drm_encoder_cleanup() as the encoder destroy callback.

Add driver-local drm_encoder_funcs and call drm_encoder_init() directly.

This is a TODO cleanup towards removing drm_simple_encoder_init().

No functional change intended.

Signed-off-by: Favilances Noir <favilances@proton.me>
---
 drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c
index 5c0c6e2cc28d..fd93ffedad64 100644
--- a/drivers/gpu/drm/rockchip/rockchip_rgb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c
@@ -13,11 +13,11 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_bridge_connector.h>
+#include <drm/drm_encoder.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drm_simple_kms_helper.h>
 
 #include "rockchip_drm_drv.h"
 #include "rockchip_rgb.h"
@@ -70,6 +70,10 @@ struct drm_encoder_helper_funcs rockchip_rgb_encoder_helper_funcs = {
 	.atomic_check = rockchip_rgb_encoder_atomic_check,
 };
 
+static const struct drm_encoder_funcs rockchip_rgb_encoder_funcs = {
+	.destroy = drm_encoder_cleanup,
+};
+
 struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
 				       struct drm_crtc *crtc,
 				       struct drm_device *drm_dev,
@@ -127,7 +131,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
 	encoder = &rgb->encoder.encoder;
 	encoder->possible_crtcs = drm_crtc_mask(crtc);
 
-	ret = drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_NONE);
+	ret = drm_encoder_init(drm_dev, encoder, &rockchip_rgb_encoder_funcs,
+			       DRM_MODE_ENCODER_NONE, NULL);
 	if (ret < 0) {
 		DRM_DEV_ERROR(drm_dev->dev,
 			      "failed to initialize encoder: %d\n", ret);
-- 
2.54.0

On Wed, May 06, 2026 at 07:53:45PM +0300, x@2005.tr wrote:
> From: Favilances Noir <favilances@proton.me>
> 
> drm_simple_encoder_init() wraps drm_encoder_init().
> 
> It uses drm_encoder_cleanup() as the encoder destroy callback.
> 
> Add driver-local drm_encoder_funcs and call drm_encoder_init() directly.
> 
> This is a TODO cleanup towards removing drm_simple_encoder_init().
> 
> No functional change intended.
> 
> Signed-off-by: Favilances Noir <favilances@proton.me>
> ---
>  drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry