drm/rockchip: dsi: Open-code drm_simple_encoder_init()
Subsystems (4)
PATCH 1/1 drm/rockchip: dsi: Open-code drm_simple_encoder_init()
Remove the dependency on drm_simple_kms_helper by open-coding the drm_simple_encoder_init call.
--- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +7 -2
@@ -25,7 +25,6 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_print.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h"
@@ -825,6 +824,10 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder)clk_disable_unprepare (dsi->grf_clk); } +static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_mipi_dsi_encoder_helper_funcs = { .atomic_check = dw_mipi_dsi_encoder_atomic_check,
@@ -840,7 +843,9 @@ static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dsi->dev->of_node); - ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_DSI ); + ret =drm_encoder_init (drm_dev, encoder, + &dw_mipi_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder with drm\n" );return ret;
Signature · 1 line
2.51.2
Heiko Stuebner
maintainerHi Diego,
Am Donnerstag, 4. Juni 2026, 14:32:25 Mitteleuropäische Sommerzeit schrieb Diogo Silva:
Quoted 2 lines
Remove the dependency on
drm_simple_kms_helperby open-coding thedrm_simple_encoder_initcall.
this description is missing a rationale.
Looking at the drm git history, I guess here you could add a second paragraph, with something like:
----------- 8< -----------
The helpers have been deprecated for years as they only add an an intermediate layer between atomic modesetting and the DRM driver. ----------- 8< -----------
Shamelessly stolen from the Todo item ;-)
Quoted 3 lines
Signed-off-by Diogo Silva <[email protected]>--- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +++++++--
Any reason for only changing the DSI driver?
Looking at [0] a number of the Rockchip drivers use the same pattern:
- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
- drivers/gpu/drm/rockchip/cdn-dp-core.c
- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
- drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
- drivers/gpu/drm/rockchip/rk3066_hdmi.c
- drivers/gpu/drm/rockchip/rockchip_lvds.c
- drivers/gpu/drm/rockchip/rockchip_rgb.c
You can just do all Rockchip ones - even in one patch I think :-) .
Thanks
Heiko
[0] https://elixir.bootlin.com/linux/v7.1-rc6/A/ident/drm_simple_encoder_init
Quoted 37 lines
1 file changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +7
-2@@ -25,7 +25,6 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_print.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h" @@ -825,6 +824,10 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder)clk_disable_unprepare (dsi->grf_clk); } +static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_mipi_dsi_encoder_helper_funcs = { .atomic_check = dw_mipi_dsi_encoder_atomic_check,@@ -840,7 +843,9 @@ static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dsi->dev->of_node); - ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_DSI ); + ret =drm_encoder_init (drm_dev, encoder, + &dw_mipi_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder with drm\n" );return ret;
Heiko Stuebner
maintainerAm Sonntag, 7. Juni 2026, 12:59:00 Mitteleuropäische Sommerzeit schrieb Heiko Stuebner:
Quoted 1 line
Hi Diego,
sorry for mangling your name, Diogo.
Heiko
Hey Heiko,
Quoted 11 lines
this description is missing a rationale.
Looking at the drm git history, I guess here you could add a second paragraph, with something like:
----------- 8< -----------
The helpers have been deprecated for years as they only add an an intermediate layer between atomic modesetting and the DRM driver. ----------- 8< -----------Shamelessly stolen from the Todo item ;-)
True. I will add the rationale then.
Quoted 13 lines
Any reason for only changing the DSI driver?
Looking at [0] a number of the Rockchip drivers use the same pattern:
-drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
-drivers/gpu/drm/rockchip/cdn-dp-core.c
-drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
-drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
-drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-drivers/gpu/drm/rockchip/rk3066_hdmi.c
-drivers/gpu/drm/rockchip/rockchip_lvds.c
-drivers/gpu/drm/rockchip/rockchip_rgb.c
Quoted 1 line
You can just do all Rockchip ones - even in one patch I think :-) .
Yes, indeed. I wanted to send a tiny patch to check if all my configurations were ok, but since it looks like they are, I will add the other rockchip drivers that have the deprecated functions.
Thanks,
Diogo
Quoted 87 lines · Heiko Stuebner
Hi Diego,
Am Donnerstag, 4. Juni 2026, 14:32:25 Mitteleuropäische Sommerzeit schrieb Diogo Silva:
Quoted 2 lines
Remove the dependency on
drm_simple_kms_helperby open-coding thedrm_simple_encoder_initcall.this description is missing a rationale.
Looking at the drm git history, I guess here you could add a second paragraph, with something like:
----------- 8< -----------
The helpers have been deprecated for years as they only add an an intermediate layer between atomic modesetting and the DRM driver. ----------- 8< -----------Shamelessly stolen from the Todo item ;-)
Quoted 3 lines
Signed-off-by Diogo Silva <[email protected]>--- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +++++++--Any reason for only changing the DSI driver?
Looking at [0] a number of the Rockchip drivers use the same pattern:
-drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
-drivers/gpu/drm/rockchip/cdn-dp-core.c
-drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
-drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
-drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c
-drivers/gpu/drm/rockchip/rk3066_hdmi.c
-drivers/gpu/drm/rockchip/rockchip_lvds.c
-drivers/gpu/drm/rockchip/rockchip_rgb.cYou can just do all Rockchip ones - even in one patch I think :-) .
Thanks
Heiko[0] https://elixir.bootlin.com/linux/v7.1-rc6/A/ident/drm_simple_encoder_init
Quoted 37 lines
1 file changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +7
-2@@ -25,7 +25,6 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_print.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h" @@ -825,6 +824,10 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder)clk_disable_unprepare (dsi->grf_clk); } +static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_mipi_dsi_encoder_helper_funcs = { .atomic_check = dw_mipi_dsi_encoder_atomic_check,@@ -840,7 +843,9 @@ static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dsi->dev->of_node); - ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_DSI ); + ret =drm_encoder_init (drm_dev, encoder, + &dw_mipi_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder with drm\n" );return ret;
PATCH v2 1/1 drm/rockchip: dsi: Open-code drm_simple_encoder_init()
In reply to Heiko StuebnerSimple KMS helper are deprecated since they only add an intermediate layer between drivers and the atomic modesetting.
This patch removes the dependency on drm_simple_encoder_init from rockchip DRM drivers by inlining this helper.
--- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 ++++++--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 ++++++--- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +++++++-- drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 8 ++++++-- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 8 ++++++-- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 8 ++++++-- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 ++++++-- drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 +++++++-- drivers/gpu/drm/rockchip/rockchip_rgb.c | 8 ++++++-- 9 files changed, 56 insertions(+), 20 deletions(-)
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +6 -3
@@ -30,7 +30,6 @@#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"
@@ -317,6 +316,10 @@ rockchip_dp_drm_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs rockchip_dp_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = { .mode_fixup = rockchip_dp_drm_encoder_mode_fixup, .mode_set = rockchip_dp_drm_encoder_mode_set,
@@ -369,8 +372,8 @@ static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp) dev->of_node);DRM_DEBUG_KMS ("possible_crtcs = 0x%x\n" , encoder->possible_crtcs); - ret =drm_simple_encoder_init (drm_dev, encoder, -DRM_MODE_ENCODER_TMDS ); + ret =drm_encoder_init (drm_dev, encoder, &rockchip_dp_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) {DRM_ERROR ("failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/cdn-dp-core.c +6 -3
@@ -23,7 +23,6 @@#include <drm/drm_of.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "cdn-dp-core.h" #include "cdn-dp-reg.h"
@@ -671,6 +670,10 @@ static int cdn_dp_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs cdn_dp_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs cdn_dp_encoder_helper_funcs = { .atomic_check = cdn_dp_encoder_atomic_check, };
@@ -988,8 +991,8 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) dev->of_node);DRM_DEBUG_KMS ("possible_crtcs = 0x%x\n" , encoder->possible_crtcs); - ret =drm_simple_encoder_init (drm_dev, encoder, -DRM_MODE_ENCODER_TMDS ); + ret =drm_encoder_init (drm_dev, encoder, &cdn_dp_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) {DRM_ERROR ("failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +7 -2
@@ -25,7 +25,6 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> #include <drm/drm_print.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h"
@@ -825,6 +824,10 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder)clk_disable_unprepare (dsi->grf_clk); } +static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_mipi_dsi_encoder_helper_funcs = { .atomic_check = dw_mipi_dsi_encoder_atomic_check,
@@ -840,7 +843,9 @@ static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dsi->dev->of_node); - ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_DSI ); + ret =drm_encoder_init (drm_dev, encoder, + &dw_mipi_dsi_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("Failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c +6 -2
@@ -23,7 +23,6 @@#include <drm/bridge/dw_mipi_dsi2.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_of.h> -#include <drm/drm_simple_kms_helper.h> #include <uapi/linux/videodev2.h>
@@ -275,6 +274,10 @@ dw_mipi_dsi2_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs dw_mipi_dsi2_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_mipi_dsi2_encoder_helper_funcs = { .atomic_enable = dw_mipi_dsi2_encoder_atomic_enable,
@@ -290,7 +293,8 @@ static int rockchip_dsi2_drm_create_encoder(struct dw_mipi_dsi2_rockchip *dsi2, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dsi2->dev->of_node); - ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_DSI ); + ret =drm_encoder_init (drm_dev, encoder, &dw_mipi_dsi2_encoder_funcs, +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {dev_err (dsi2->dev,"Failed to initialize encoder with drm\n" );return ret;
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +6 -2
@@ -16,7 +16,6 @@#include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h"
@@ -322,6 +321,10 @@ dw_hdmi_rockchip_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = { .mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup, .mode_set = dw_hdmi_rockchip_encoder_mode_set,
@@ -604,7 +607,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, }drm_encoder_helper_add (encoder, &dw_hdmi_rockchip_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &dw_hdmi_rockchip_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );platform_set_drvdata (pdev, hdmi);
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +6 -2
@@ -23,7 +23,6 @@#include <drm/drm_bridge_connector.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h"
@@ -160,6 +159,10 @@ dw_hdmi_qp_rockchip_encoder_atomic_check(struct drm_encoder *encoder,return ret; } +static const struct drm_encoder_funcs dw_hdmi_qp_rockchip_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_hdmi_qp_rockchip_encoder_helper_funcs = { .enable = dw_hdmi_qp_rockchip_encoder_enable,
@@ -586,7 +589,8 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master,return ret;drm_encoder_helper_add (encoder, &dw_hdmi_qp_rockchip_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &dw_hdmi_qp_rockchip_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );platform_set_drvdata (pdev, hdmi);
drivers/gpu/drm/rockchip/rk3066_hdmi.c +6 -2
@@ -12,7 +12,6 @@#include <drm/drm_of.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include <linux/clk.h> #include <linux/mfd/syscon.h>
@@ -454,6 +453,10 @@ rk3066_hdmi_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs rk3066_hdmi_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs rk3066_hdmi_encoder_helper_funcs = { .atomic_check = rk3066_hdmi_encoder_atomic_check,
@@ -696,7 +699,8 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi)return -EPROBE_DEFER ;drm_encoder_helper_add (encoder, &rk3066_hdmi_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &rk3066_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &rk3066_hdmi_bridge_funcs;
drivers/gpu/drm/rockchip/rockchip_lvds.c +7 -2
@@ -24,7 +24,6 @@#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_lvds.h"
@@ -427,6 +426,10 @@ static void px30_lvds_encoder_disable(struct drm_encoder *encoder)drm_panel_unprepare (lvds->panel); } +static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs rk3288_lvds_encoder_helper_funcs = { .enable = rk3288_lvds_encoder_enable,
@@ -594,7 +597,9 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master, encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, dev->of_node); - ret =drm_simple_encoder_init (drm_dev, encoder,DRM_MODE_ENCODER_LVDS ); + ret =drm_encoder_init (drm_dev, encoder, + &rockchip_lvds_encoder_funcs, +DRM_MODE_ENCODER_LVDS ,NULL );if (ret <0 ) {drm_err (drm_dev,"failed to initialize encoder: %d\n" , ret);
drivers/gpu/drm/rockchip/rockchip_rgb.c +6 -2
@@ -17,7 +17,6 @@#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"
@@ -65,6 +64,10 @@ rockchip_rgb_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs rockchip_rgb_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs rockchip_rgb_encoder_helper_funcs = { .atomic_check = rockchip_rgb_encoder_atomic_check,
@@ -127,7 +130,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);
Signature · 1 line
2.51.2
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] The return value of drm_encoder_init() is ignored, which can lead to a NULL pointer dereference on subsequent error cleanup paths. --
commit 386dea7155c8b56dde923c52be1155ed455ebd09
Author: Diogo Silva <[email protected]>
drm/rockchip: dsi: Open-code drm_simple_encoder_init()
This patch removes the dependency on the deprecated simple KMS helper from rockchip DRM drivers by inlining drm_simple_encoder_init into the drivers.
[ ... ]
Quoted 3 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +0
-0
[ ... ]
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, · line 611
Quoted 7 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +2
-1@@ -604,7 +607,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, }drm_encoder_helper_add (encoder, &dw_hdmi_rockchip_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &dw_hdmi_rockchip_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );
[Severity: High]
This isn't a bug introduced by this patch, but does the return value of drm_encoder_init() need to be checked here?
If drm_encoder_init() fails, encoder->dev remains NULL. If the subsequent dw_hdmi_bind() call fails, the error path jumps to err_bind and calls drm_encoder_cleanup(encoder). This explicitly dereferences encoder->dev inside drm_mode_object_unregister(), which would cause a NULL pointer dereference.
[ ... ]
Quoted 3 lines
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +0
-0
[ ... ]
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master, · line 593
Quoted 7 lines
drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +2
-1@@ -586,7 +589,8 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *master,return ret;drm_encoder_helper_add (encoder, &dw_hdmi_qp_rockchip_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &dw_hdmi_qp_rockchip_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );
[Severity: High]
This is a pre-existing issue, but should this code check the return value of drm_encoder_init() for errors?
Similar to the previous file, if this initialization fails and leaves encoder->dev as NULL, a subsequent failure in dw_hdmi_qp_bind() triggers an error path that explicitly calls drm_encoder_cleanup(encoder), leading to a NULL pointer dereference.
[ ... ]
Quoted 3 lines
drivers/gpu/drm/rockchip/rk3066_hdmi.c +0
-0
[ ... ]
drivers/gpu/drm/rockchip/rk3066_hdmi.c rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) · line 703
Quoted 7 lines
drivers/gpu/drm/rockchip/rk3066_hdmi.c +2
-1@@ -696,7 +699,8 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi)return -EPROBE_DEFER ;drm_encoder_helper_add (encoder, &rk3066_hdmi_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &rk3066_hdmi_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );
[Severity: High]
This is a pre-existing issue, but what happens if drm_encoder_init() fails here?
If it fails and a subsequent initialization step fails, the error cleanup will call the encoder's destroy function, causing a NULL pointer dereference since encoder->dev would be NULL.
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Hi Diogo,
Quoted 17 lines · Diogo Silva
Simple KMS helper are deprecated since they only add an intermediate layer between drivers and the atomic modesetting.
This patch removes the dependency ondrm_simple_encoder_initfrom rockchip DRM drivers by inlining this helper.Signed-off-by Diogo Silva <[email protected]>--- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 ++++++--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 ++++++--- drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +++++++-- drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 8 ++++++-- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 8 ++++++-- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 8 ++++++-- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 ++++++-- drivers/gpu/drm/rockchip/rockchip_lvds.c | 9 +++++++-- drivers/gpu/drm/rockchip/rockchip_rgb.c | 8 ++++++-- 9 files changed, 56 insertions(+), 20 deletions(-)
[snip]
Quoted 24 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +4
-1@@ -16,7 +16,6 @@#include <drm/drm_edid.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> -#include <drm/drm_simple_kms_helper.h> #include "rockchip_drm_drv.h" @@ -322,6 +321,10 @@ dw_hdmi_rockchip_encoder_atomic_check(struct drm_encoder *encoder,return 0 ; } +static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; +static const struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = { .mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup, .mode_set = dw_hdmi_rockchip_encoder_mode_set,
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, · line 611
Quoted 6 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +2
-1@@ -604,7 +607,8 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, }drm_encoder_helper_add (encoder, &dw_hdmi_rockchip_encoder_helper_funcs); -drm_simple_encoder_init (drm, encoder,DRM_MODE_ENCODER_TMDS ); +drm_encoder_init (drm, encoder, &dw_hdmi_rockchip_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL );
Please base your work on latest drm-misc tree, this has already been addressed in commit 3de723684be5 ("drm/rockchip: dw_hdmi: Use drmres helpers for encoder resources") [1].
Also instead of open-code, maybe a change to use drmm_encoder_init() is more appropriate for some of the other drivers?
[1] https://cgit.freedesktop.org/drm/drm-misc/commit/?id=3de723684be5c13517dea3dba287d06e12678c86
Regards,
Jonas
Quoted 3 lines
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +0
-0platform_set_drvdata (pdev, hdmi);
[snip]
Hey Jonas,
Quoted 3 lines
Please base your work on latest drm-misc tree, this has already been addressed in commit
3de723684be5("drm/rockchip:dw_hdmi: Use drmres helpers for encoder resources") [1].
Sorry, I'll rebase it on the DRM tree.
Quoted 4 lines
Also instead of open-code, maybe a change to use
drmm_encoder_init()is more appropriate for some of the other drivers?
Wouldn't it be better to first remove the deprecated function and then, in another patch, change to the managed encoder as an improvement?
BR,
Diogo