Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f8f2d29 authored by John Keeping's avatar John Keeping Committed by Sean Paul
Browse files

drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded 



This ensures that the output resolution is known before fbcon loads.
mipi_dsi_host_register() is moved above dw_mipi_dsi_register() to
simplify error cleanup since the order of these operations does not
matter.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170224125506.21533-22-john@metanate.com
parent d790ad03

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

+18 −3
Original line number Diff line number Diff line
@@ -1189,12 +1189,27 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, 
		goto err_pllref;

	}



	dev_set_drvdata(dev, dsi);



	dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;

	dsi->dsi_host.dev = dev;

	return mipi_dsi_host_register(&dsi->dsi_host);

	ret = mipi_dsi_host_register(&dsi->dsi_host);

	if (ret) {

		dev_err(dev, "Failed to register MIPI host: %d\n", ret);

		goto err_cleanup;

	}



	if (!dsi->panel) {

		ret = -EPROBE_DEFER;

		goto err_mipi_dsi_host;

	}



	dev_set_drvdata(dev, dsi);

	return 0;



err_mipi_dsi_host:

	mipi_dsi_host_unregister(&dsi->dsi_host);

err_cleanup:

	drm_encoder_cleanup(&dsi->encoder);

	drm_connector_cleanup(&dsi->connector);

err_pllref:

	clk_disable_unprepare(dsi->pllref_clk);

	return ret;