drm: arm: malidp: Don't destroy planes manually in error handlers

The top-level error handler calls drm_mode_config_cleanup() which will
destroy all planes. There's no need to destroy them manually in lower
error handlers.

As plane cleanup is now handled entirely by drm_mode_config_cleanup(),
we must ensure that the plane .destroy() handler frees allocated memory
for the plane object that was freed by malidp_de_planes_destroy(). Do so
by replacing the call to devm_kfree() in the .destroy() handler by
kfree(). devm_kfree() is currently a no-op as the plane memory is
allocated with kzalloc(), not devm_kzalloc().

Signed-off-by: Laurent Pinchart <[email protected]>
Signed-off-by: Liviu Dudau <[email protected]>

diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c
index 7b952559fc43628c87b6f64224f8e1d5aec3c07b..fcc62bc60f6a7fbd7d47554ac2ebf2b8d2e4be41 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_crtc.c
+++ b/drivers/gpu/drm/arm/malidp_crtc.c
@@ -531,14 +531,13 @@ int malidp_crtc_init(struct drm_device *drm)
 
        if (!primary) {
                DRM_ERROR("no primary plane found\n");
-               ret = -EINVAL;
-               goto crtc_cleanup_planes;
+               return -EINVAL;
        }
 
        ret = drm_crtc_init_with_planes(drm, &malidp->crtc, primary, NULL,
                                        &malidp_crtc_funcs, NULL);
        if (ret)
-               goto crtc_cleanup_planes;
+               return ret;
 
        drm_crtc_helper_add(&malidp->crtc, &malidp_crtc_helper_funcs);
        drm_mode_crtc_set_gamma_size(&malidp->crtc, MALIDP_GAMMA_LUT_SIZE);
@@ -548,9 +547,4 @@ int malidp_crtc_init(struct drm_device *drm)
        malidp_se_set_enh_coeffs(malidp->dev);
 
        return 0;
-
-crtc_cleanup_planes:
-       malidp_de_planes_destroy(drm);
-
-       return ret;
 }

diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index 3c628e43bf2571a29d0e4c610ba9f2a570c2d6ba..2b26f40a9786d1a075f1cf32c02113cc47adf32d 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -278,7 +278,6 @@ static int malidp_init(struct drm_device *drm)
 
 static void malidp_fini(struct drm_device *drm)
 {
-       malidp_de_planes_destroy(drm);
        drm_mode_config_cleanup(drm);
 }
 

diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h
index c2375bb496192f8c799acac81ccaae166588b471..c70989b933874e37f4ee125c50e8b1c20abb7112 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_drv.h
+++ b/drivers/gpu/drm/arm/malidp_drv.h
@@ -60,7 +60,6 @@ struct malidp_crtc_state {
 #define to_malidp_crtc_state(x) container_of(x, struct malidp_crtc_state, base)
 
 int malidp_de_planes_init(struct drm_device *drm);
-void malidp_de_planes_destroy(struct drm_device *drm);
 int malidp_crtc_init(struct drm_device *drm);
 
 /* often used combination of rotational bits */

diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 1a2992f178e51a93536b6a5aa3cd9479004a7f36..648e97693df926c9ccc691da6e895826b645896b 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -64,7 +64,7 @@ static void malidp_de_plane_destroy(struct drm_plane *plane)
 
        drm_plane_helper_disable(plane);
        drm_plane_cleanup(plane);
-       devm_kfree(plane->dev->dev, mp);
+       kfree(mp);
 }
 
 /*
@@ -449,18 +449,7 @@ int malidp_de_planes_init(struct drm_device *drm)
        return 0;
 
 cleanup:
-       malidp_de_planes_destroy(drm);
        kfree(formats);
 
        return ret;
 }
-
-void malidp_de_planes_destroy(struct drm_device *drm)
-{
-       struct drm_plane *p, *pt;
-
-       list_for_each_entry_safe(p, pt, &drm->mode_config.plane_list, head) {
-               drm_plane_cleanup(p);
-               kfree(p);
-       }
-}