Commit 93d6e1b8 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/mdp4: use drmm-managed allocation for mdp4_dtv_encoder 



Change struct mdp4_dtv_encoder allocation to use drmm_encoder_alloc().
This removes the need to perform any actions on this encoder
destruction.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/546178/
Link: https://lore.kernel.org/r/20230708010407.3871346-15-dmitry.baryshkov@linaro.org
parent e79571e8

drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c

+7 −30
Original line number Diff line number Diff line
@@ -25,17 +25,6 @@ static struct mdp4_kms *get_kms(struct drm_encoder *encoder) 
	return to_mdp4_kms(to_mdp_kms(priv->kms));

}



static void mdp4_dtv_encoder_destroy(struct drm_encoder *encoder)

{

	struct mdp4_dtv_encoder *mdp4_dtv_encoder = to_mdp4_dtv_encoder(encoder);

	drm_encoder_cleanup(encoder);

	kfree(mdp4_dtv_encoder);

}



static const struct drm_encoder_funcs mdp4_dtv_encoder_funcs = {

	.destroy = mdp4_dtv_encoder_destroy,

};



static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder,

		struct drm_display_mode *mode,

		struct drm_display_mode *adjusted_mode)
@@ -173,41 +162,29 @@ long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate) 
/* initialize encoder */

struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev)

{

	struct drm_encoder *encoder = NULL;

	struct drm_encoder *encoder;

	struct mdp4_dtv_encoder *mdp4_dtv_encoder;

	int ret;



	mdp4_dtv_encoder = kzalloc(sizeof(*mdp4_dtv_encoder), GFP_KERNEL);

	if (!mdp4_dtv_encoder) {

		ret = -ENOMEM;

		goto fail;

	}

	mdp4_dtv_encoder = drmm_encoder_alloc(dev, struct mdp4_dtv_encoder, base,

					      NULL, DRM_MODE_ENCODER_TMDS, NULL);

	if (IS_ERR(mdp4_dtv_encoder))

		return ERR_CAST(mdp4_dtv_encoder);



	encoder = &mdp4_dtv_encoder->base;



	drm_encoder_init(dev, encoder, &mdp4_dtv_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

	drm_encoder_helper_add(encoder, &mdp4_dtv_encoder_helper_funcs);



	mdp4_dtv_encoder->hdmi_clk = devm_clk_get(dev->dev, "hdmi_clk");

	if (IS_ERR(mdp4_dtv_encoder->hdmi_clk)) {

		DRM_DEV_ERROR(dev->dev, "failed to get hdmi_clk\n");

		ret = PTR_ERR(mdp4_dtv_encoder->hdmi_clk);

		goto fail;

		return ERR_CAST(mdp4_dtv_encoder->hdmi_clk);

	}



	mdp4_dtv_encoder->mdp_clk = devm_clk_get(dev->dev, "tv_clk");

	if (IS_ERR(mdp4_dtv_encoder->mdp_clk)) {

		DRM_DEV_ERROR(dev->dev, "failed to get tv_clk\n");

		ret = PTR_ERR(mdp4_dtv_encoder->mdp_clk);

		goto fail;

		return ERR_CAST(mdp4_dtv_encoder->mdp_clk);

	}



	return encoder;



fail:

	if (encoder)

		mdp4_dtv_encoder_destroy(encoder);



	return ERR_PTR(ret);

}