Commit 2bb98fc1 authored by Philipp Stanner's avatar Philipp Stanner Committed by Laurentiu Palcu
Browse files

drm/imx/dcss: have all init functions use devres 



dcss currently allocates and ioremaps quite a few resources in its probe
function's call graph. Devres now provides convenient functions which
perform the same task but do the cleanup automatically.

Port all memory allocations and ioremap() calls to the devres
counterparts.

Signed-off-by: default avatarPhilipp Stanner <pstanner@redhat.com>
Reviewed-by: default avatarLaurentiu Palcu <laurentiu.palcu@oss.nxp.com>
Signed-off-by: default avatarLaurentiu Palcu <laurentiu.palcu@oss.nxp.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240124111904.18261-4-pstanner@redhat.com
parent 90393c9b

drivers/gpu/drm/imx/dcss/dcss-blkctl.c

+2 −11
Original line number Diff line number Diff line
@@ -42,14 +42,13 @@ int dcss_blkctl_init(struct dcss_dev *dcss, unsigned long blkctl_base) 
{

	struct dcss_blkctl *blkctl;



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

	blkctl = devm_kzalloc(dcss->dev, sizeof(*blkctl), GFP_KERNEL);

	if (!blkctl)

		return -ENOMEM;



	blkctl->base_reg = ioremap(blkctl_base, SZ_4K);

	blkctl->base_reg = devm_ioremap(dcss->dev, blkctl_base, SZ_4K);

	if (!blkctl->base_reg) {

		dev_err(dcss->dev, "unable to remap BLK CTRL base\n");

		kfree(blkctl);

		return -ENOMEM;

	}
@@ -60,11 +59,3 @@ int dcss_blkctl_init(struct dcss_dev *dcss, unsigned long blkctl_base) 


	return 0;

}
 


void dcss_blkctl_exit(struct dcss_blkctl *blkctl)

{

	if (blkctl->base_reg)

		iounmap(blkctl->base_reg);



	kfree(blkctl);

}

drivers/gpu/drm/imx/dcss/dcss-ctxld.c

+3 −11
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ int dcss_ctxld_init(struct dcss_dev *dcss, unsigned long ctxld_base) 
	struct dcss_ctxld *ctxld;

	int ret;



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

	ctxld = devm_kzalloc(dcss->dev, sizeof(*ctxld), GFP_KERNEL);

	if (!ctxld)

		return -ENOMEM;
@@ -217,7 +217,7 @@ int dcss_ctxld_init(struct dcss_dev *dcss, unsigned long ctxld_base) 
		goto err;

	}



	ctxld->ctxld_reg = ioremap(ctxld_base, SZ_4K);

	ctxld->ctxld_reg = devm_ioremap(dcss->dev, ctxld_base, SZ_4K);

	if (!ctxld->ctxld_reg) {

		dev_err(dcss->dev, "ctxld: unable to remap ctxld base\n");

		ret = -ENOMEM;
@@ -226,18 +226,14 @@ int dcss_ctxld_init(struct dcss_dev *dcss, unsigned long ctxld_base) 


	ret = dcss_ctxld_irq_config(ctxld, to_platform_device(dcss->dev));

	if (ret)

		goto err_irq;

		goto err;



	dcss_ctxld_hw_cfg(ctxld);



	return 0;



err_irq:

	iounmap(ctxld->ctxld_reg);



err:

	dcss_ctxld_free_ctx(ctxld);

	kfree(ctxld);



	return ret;

}
@@ -246,11 +242,7 @@ void dcss_ctxld_exit(struct dcss_ctxld *ctxld) 
{

	free_irq(ctxld->irq, ctxld);



	if (ctxld->ctxld_reg)

		iounmap(ctxld->ctxld_reg);



	dcss_ctxld_free_ctx(ctxld);

	kfree(ctxld);

}



static int dcss_ctxld_enable_locked(struct dcss_ctxld *ctxld)

drivers/gpu/drm/imx/dcss/dcss-dev.c

+2 −10
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ static int dcss_submodules_init(struct dcss_dev *dcss) 
	dcss_ctxld_exit(dcss->ctxld);



ctxld_err:

	dcss_blkctl_exit(dcss->blkctl);



	dcss_clocks_disable(dcss);



	return ret;
@@ -124,7 +122,6 @@ static void dcss_submodules_stop(struct dcss_dev *dcss) 
	dcss_ss_exit(dcss->ss);

	dcss_dtg_exit(dcss->dtg);

	dcss_ctxld_exit(dcss->ctxld);

	dcss_blkctl_exit(dcss->blkctl);

	dcss_clocks_disable(dcss);

}
@@ -190,7 +187,7 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output) 
		return ERR_PTR(-EBUSY);

	}



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

	dcss = devm_kzalloc(dev, sizeof(*dcss), GFP_KERNEL);

	if (!dcss)

		return ERR_PTR(-ENOMEM);
@@ -201,7 +198,7 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output) 
	ret = dcss_clks_init(dcss);

	if (ret) {

		dev_err(dev, "clocks initialization failed\n");

		goto err;

		return ERR_PTR(ret);

	}



	dcss->of_port = of_graph_get_port_by_id(dev->of_node, 0);
@@ -233,9 +230,6 @@ struct dcss_dev *dcss_dev_create(struct device *dev, bool hdmi_output) 
clks_err:

	dcss_clks_release(dcss);



err:

	kfree(dcss);



	return ERR_PTR(ret);

}
@@ -253,8 +247,6 @@ void dcss_dev_destroy(struct dcss_dev *dcss) 
	dcss_submodules_stop(dcss);



	dcss_clks_release(dcss);



	kfree(dcss);

}



static int dcss_dev_suspend(struct device *dev)

drivers/gpu/drm/imx/dcss/dcss-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ extern const struct dev_pm_ops dcss_dev_pm_ops; 
/* BLKCTL */

int dcss_blkctl_init(struct dcss_dev *dcss, unsigned long blkctl_base);

void dcss_blkctl_cfg(struct dcss_blkctl *blkctl);

void dcss_blkctl_exit(struct dcss_blkctl *blkctl);



/* CTXLD */

int dcss_ctxld_init(struct dcss_dev *dcss, unsigned long ctxld_base);

drivers/gpu/drm/imx/dcss/dcss-dpr.c

+3 −18
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int dcss_dpr_ch_init_all(struct dcss_dpr *dpr, unsigned long dpr_base) 


		ch->base_ofs = dpr_base + i * 0x1000;



		ch->base_reg = ioremap(ch->base_ofs, SZ_4K);

		ch->base_reg = devm_ioremap(dpr->dev, ch->base_ofs, SZ_4K);

		if (!ch->base_reg) {

			dev_err(dpr->dev, "dpr: unable to remap ch %d base\n",

				i);
@@ -155,7 +155,7 @@ int dcss_dpr_init(struct dcss_dev *dcss, unsigned long dpr_base) 
{

	struct dcss_dpr *dpr;



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

	dpr = devm_kzalloc(dcss->dev, sizeof(*dpr), GFP_KERNEL);

	if (!dpr)

		return -ENOMEM;
@@ -164,18 +164,8 @@ int dcss_dpr_init(struct dcss_dev *dcss, unsigned long dpr_base) 
	dpr->ctxld = dcss->ctxld;

	dpr->ctx_id = CTX_SB_HP;



	if (dcss_dpr_ch_init_all(dpr, dpr_base)) {

		int i;



		for (i = 0; i < 3; i++) {

			if (dpr->ch[i].base_reg)

				iounmap(dpr->ch[i].base_reg);

		}



		kfree(dpr);



	if (dcss_dpr_ch_init_all(dpr, dpr_base))

		return -ENOMEM;

	}



	return 0;

}
@@ -189,12 +179,7 @@ void dcss_dpr_exit(struct dcss_dpr *dpr) 
		struct dcss_dpr_ch *ch = &dpr->ch[ch_no];



		dcss_writel(0, ch->base_reg + DCSS_DPR_SYSTEM_CTRL0);



		if (ch->base_reg)

			iounmap(ch->base_reg);

	}



	kfree(dpr);

}



static u32 dcss_dpr_x_pix_wide_adjust(struct dcss_dpr_ch *ch, u32 pix_wide,