[PATCH v2 07/21] drm/imx: imx-ldb: use drm managed resources

[Philipp Zabel]

Use drmm_kzalloc() to align encoder memory lifetime with the drm device,
and use drmm_add_action_or_reset() to make sure drm_encoder_cleanup() is
called before the memory is freed.

Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
 drivers/gpu/drm/imx/imx-ldb.c | 43 +++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index c3639cc32ddf..d4beb58f509d 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -22,6 +22,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_managed.h>
 #include <drm/drm_of.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_print.h>
@@ -47,12 +48,18 @@
 #define LDB_DI1_VS_POL_ACT_LOW         (1 << 10)
 #define LDB_BGREF_RMODE_INT            (1 << 15)
 
+struct imx_ldb_channel;
+
+struct imx_ldb_encoder {
+       struct drm_connector connector;
+       struct drm_encoder encoder;
+       struct imx_ldb_channel *channel;
+};
+
 struct imx_ldb;
 
 struct imx_ldb_channel {
        struct imx_ldb *ldb;
-       struct drm_connector connector;
-       struct drm_encoder encoder;
 
        /* Defines what is connected to the ldb, only one at a time */
        struct drm_panel *panel;
@@ -70,12 +77,12 @@ struct imx_ldb_channel {
 
 static inline struct imx_ldb_channel *con_to_imx_ldb_ch(struct drm_connector 
*c)
 {
-       return container_of(c, struct imx_ldb_channel, connector);
+       return container_of(c, struct imx_ldb_encoder, connector)->channel;
 }
 
 static inline struct imx_ldb_channel *enc_to_imx_ldb_ch(struct drm_encoder *e)
 {
-       return container_of(e, struct imx_ldb_channel, encoder);
+       return container_of(e, struct imx_ldb_encoder, encoder)->channel;
 }
 
 struct bus_mux {
@@ -407,16 +414,35 @@ static int imx_ldb_get_clk(struct imx_ldb *ldb, int chno)
        return PTR_ERR_OR_ZERO(ldb->clk_pll[chno]);
 }
 
+static void imx_ldb_encoder_cleanup(struct drm_device *drm, void *data)
+{
+       struct drm_encoder *encoder = data;
+
+       drm_encoder_cleanup(encoder);
+}
+
 static int imx_ldb_register(struct drm_device *drm,
        struct imx_ldb_channel *imx_ldb_ch)
 {
        struct imx_ldb *ldb = imx_ldb_ch->ldb;
-       struct drm_connector *connector = &imx_ldb_ch->connector;
-       struct drm_encoder *encoder = &imx_ldb_ch->encoder;
+       struct imx_ldb_encoder *ldb_encoder;
+       struct drm_connector *connector;
+       struct drm_encoder *encoder;
        int ret;
 
-       memset(connector, 0, sizeof(*connector));
-       memset(encoder, 0, sizeof(*encoder));
+       ldb_encoder = drmm_kzalloc(drm, sizeof(*ldb_encoder), GFP_KERNEL);
+       if (!ldb_encoder)
+               return -ENOMEM;
+
+       ldb_encoder->channel = imx_ldb_ch;
+       connector = &ldb_encoder->connector;
+       encoder = &ldb_encoder->encoder;
+
+       drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_LVDS);
+
+       ret = drmm_add_action_or_reset(drm, imx_ldb_encoder_cleanup, encoder);
+       if (ret)
+               return ret;
 
        ret = imx_drm_encoder_parse_of(drm, encoder, imx_ldb_ch->child);
        if (ret)
@@ -433,7 +459,6 @@ static int imx_ldb_register(struct drm_device *drm,
        }
 
        drm_encoder_helper_add(encoder, &imx_ldb_encoder_helper_funcs);
-       drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_LVDS);
 
        if (imx_ldb_ch->bridge) {
                ret = drm_bridge_attach(encoder, imx_ldb_ch->bridge, NULL, 0);
-- 
2.20.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel