Hi
Am 13.03.25 um 15:25 schrieb Luca Ceresoli:
When aperture_remove_all_conflicting_devices() fails, the current code
returns without going through the rollback actions at the end of the
function, thus the actions done by drm_dev_alloc() and mxsfb_load() are not
undone.
Fix by using a goto statament, as done for the previous and following error
conditions.
Fixes: c8e7b185d45b ("drm/mxsfb: Remove generic DRM drivers in probe function")
Signed-off-by: Luca Ceresoli <luca.ceresoli@xxxxxxxxxxx>
---
The offending commit is not yet merged into master, and even less in a
released kernel, so this does not need to go through stable.
---
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index c183b1112bc4e9fe4f3b048a2b6e4c98d1d47cb3..b4273e678d26dbc3dee2014266d61470da4e8010 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -365,9 +365,10 @@ static int mxsfb_probe(struct platform_device *pdev)
* located anywhere in RAM
*/
ret = aperture_remove_all_conflicting_devices(mxsfb_driver.name);
- if (ret)
- return dev_err_probe(&pdev->dev, ret,
- "can't kick out existing framebuffers\n");
+ if (ret) {
+ dev_err_probe(&pdev->dev, ret, "can't kick out existing framebuffers\n");
+ goto err_unload;
+ }
I must have missed that when I reviewed the patch. But this call should
happen much earlier. right at the top of the probe function before
drm_dev_alloc(). Conflicting drivers need to be kicked out before
setting up DRM. Could you please send a patch to move the call to the
top? No extra cleanup would be required then.
Best regards
Thomas
ret = drm_dev_register(drm, 0);
if (ret)
---
base-commit: f9f087d946266bc5da7c3a17bd8fd9d01969e3cf
change-id: 20250313-mxsfb_probe-fix-rollback-on-error-3074b9080f34
Best regards,
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
