Unverified Commit 77d2a71b authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/bridge: sn65dsi86: Switch to devm MIPI-DSI helpers 



Let's switch to the new devm MIPI-DSI function to register and attach
our secondary device. This also avoids leaking the device when we detach
the bridge.

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-17-maxime@cerno.tech
parent 6ef7ee48

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+7 −15
Original line number Diff line number Diff line
@@ -709,6 +709,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, 
	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);

	struct mipi_dsi_host *host;

	struct mipi_dsi_device *dsi;

	struct device *dev = pdata->dev;

	const struct mipi_dsi_device_info info = { .type = "ti_sn_bridge",

						   .channel = 0,

						   .node = NULL,
@@ -748,7 +749,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, 
		goto err_dsi_host;

	}



	dsi = mipi_dsi_device_register_full(host, &info);

	dsi = devm_mipi_dsi_device_register_full(dev, host, &info);

	if (IS_ERR(dsi)) {

		DRM_ERROR("failed to create dsi device\n");

		ret = PTR_ERR(dsi);
@@ -761,16 +762,16 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, 
	dsi->mode_flags = MIPI_DSI_MODE_VIDEO;



	/* check if continuous dsi clock is required or not */

	pm_runtime_get_sync(pdata->dev);

	pm_runtime_get_sync(dev);

	regmap_read(pdata->regmap, SN_DPPLL_SRC_REG, &val);

	pm_runtime_put_autosuspend(pdata->dev);

	pm_runtime_put_autosuspend(dev);

	if (!(val & DPPLL_CLK_SRC_DSICLK))

		dsi->mode_flags |= MIPI_DSI_CLOCK_NON_CONTINUOUS;



	ret = mipi_dsi_attach(dsi);

	ret = devm_mipi_dsi_attach(dev, dsi);

	if (ret < 0) {

		DRM_ERROR("failed to attach dsi to host\n");

		goto err_dsi_attach;

		goto err_dsi_host;

	}

	pdata->dsi = dsi;
@@ -781,14 +782,10 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, 
	ret = drm_bridge_attach(bridge->encoder, pdata->next_bridge,

				&pdata->bridge, flags);

	if (ret < 0)

		goto err_dsi_detach;

		goto err_dsi_host;



	return 0;



err_dsi_detach:

	mipi_dsi_detach(dsi);

err_dsi_attach:

	mipi_dsi_device_unregister(dsi);

err_dsi_host:

	drm_connector_cleanup(&pdata->connector);

err_conn_init:
@@ -1284,11 +1281,6 @@ static void ti_sn_bridge_remove(struct auxiliary_device *adev) 
	if (!pdata)

		return;



	if (pdata->dsi) {

		mipi_dsi_detach(pdata->dsi);

		mipi_dsi_device_unregister(pdata->dsi);

	}



	drm_bridge_remove(&pdata->bridge);



	of_node_put(pdata->host_node);