drm/msm/mdp5: use devres-managed allocation for mixer data

Use devm_kzalloc to create mixer data structure. This allows us
to remove corresponding kfree and drop mdp5_mixer_destroy() function.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/546166/
Link: https://lore.kernel.org/r/20230708010407.3871346-5-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index d2bd14e8dadf6dfcc04fc1600df6928d204c0141..3189b3b0a7432146a8f8be01780241073ca62164 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -211,9 +211,6 @@ static void mdp5_kms_destroy(struct msm_kms *kms)
        struct msm_gem_address_space *aspace = kms->aspace;
        int i;
 
-       for (i = 0; i < mdp5_kms->num_hwmixers; i++)
-               mdp5_mixer_destroy(mdp5_kms->hwmixers[i]);
-
        for (i = 0; i < mdp5_kms->num_hwpipes; i++)
                mdp5_pipe_destroy(mdp5_kms->hwpipes[i]);
 
@@ -720,7 +717,7 @@ static int hwmixer_init(struct mdp5_kms *mdp5_kms)
        for (i = 0; i < hw_cfg->lm.count; i++) {
                struct mdp5_hw_mixer *mixer;
 
-               mixer = mdp5_mixer_init(&hw_cfg->lm.instances[i]);
+               mixer = mdp5_mixer_init(dev, &hw_cfg->lm.instances[i]);
                if (IS_ERR(mixer)) {
                        ret = PTR_ERR(mixer);
                        DRM_DEV_ERROR(dev->dev, "failed to construct LM%d (%d)\n",

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c
index 2536def2a0005df9fc3bba450c8bf28582d4a16d..2822b533f80774853cb15c6dc0d8573924d5171e 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c
@@ -140,20 +140,16 @@ int mdp5_mixer_release(struct drm_atomic_state *s, struct mdp5_hw_mixer *mixer)
        return 0;
 }
 
-void mdp5_mixer_destroy(struct mdp5_hw_mixer *mixer)
-{
-       kfree(mixer);
-}
-
 static const char * const mixer_names[] = {
        "LM0", "LM1", "LM2", "LM3", "LM4", "LM5",
 };
 
-struct mdp5_hw_mixer *mdp5_mixer_init(const struct mdp5_lm_instance *lm)
+struct mdp5_hw_mixer *mdp5_mixer_init(struct drm_device *dev,
+                                     const struct mdp5_lm_instance *lm)
 {
        struct mdp5_hw_mixer *mixer;
 
-       mixer = kzalloc(sizeof(*mixer), GFP_KERNEL);
+       mixer = devm_kzalloc(dev->dev, sizeof(*mixer), GFP_KERNEL);
        if (!mixer)
                return ERR_PTR(-ENOMEM);
 

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h
index 545ee223b9d74077d58bd2d665c3bd0fcfb16d44..2bedd75835bcd983ed522988b9ab8af2a6236826 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h
@@ -25,8 +25,8 @@ struct mdp5_hw_mixer_state {
        struct drm_crtc *hwmixer_to_crtc[8];
 };
 
-struct mdp5_hw_mixer *mdp5_mixer_init(const struct mdp5_lm_instance *lm);
-void mdp5_mixer_destroy(struct mdp5_hw_mixer *lm);
+struct mdp5_hw_mixer *mdp5_mixer_init(struct drm_device *dev,
+                                     const struct mdp5_lm_instance *lm);
 int mdp5_mixer_assign(struct drm_atomic_state *s, struct drm_crtc *crtc,
                      uint32_t caps, struct mdp5_hw_mixer **mixer,
                      struct mdp5_hw_mixer **r_mixer);