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

Commit 0a02d495 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Tomi Valkeinen
Browse files

drm/omap: populate DSI platform bus earlier 



After the changes from 4.20 the DSI encoder tries to find the
attached panel before populating the DSI bus. If the panel is
not found -EPROBE_DEFER is returned, so the DSI bus is never
populated and the panel never added.

Fix this by populating the DSI bus before searching for the
video sink in dsi_init_output().

Fixes: 27d62452 ("drm/omap: dss: Acquire next dssdev at probe time")
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181121160916.22017-3-sebastian.reichel@collabora.com
parent 0a7f54ea

drivers/gpu/drm/omapdrm/dss/dsi.c

+10 −10
Original line number Diff line number Diff line
@@ -5418,9 +5418,15 @@ static int dsi_probe(struct platform_device *pdev) 
		dsi->num_lanes_supported = 3;

	}



	r = of_platform_populate(dev->of_node, NULL, NULL, dev);

	if (r) {

		DSSERR("Failed to populate DSI child devices: %d\n", r);

		goto err_pm_disable;

	}



	r = dsi_init_output(dsi);

	if (r)

		goto err_pm_disable;

		goto err_of_depopulate;



	r = dsi_probe_of(dsi);

	if (r) {
@@ -5428,22 +5434,16 @@ static int dsi_probe(struct platform_device *pdev) 
		goto err_uninit_output;

	}



	r = of_platform_populate(dev->of_node, NULL, NULL, dev);

	if (r) {

		DSSERR("Failed to populate DSI child devices: %d\n", r);

		goto err_uninit_output;

	}



	r = component_add(&pdev->dev, &dsi_component_ops);

	if (r)

		goto err_of_depopulate;

		goto err_uninit_output;



	return 0;



err_of_depopulate:

	of_platform_depopulate(dev);

err_uninit_output:

	dsi_uninit_output(dsi);

err_of_depopulate:

	of_platform_depopulate(dev);

err_pm_disable:

	pm_runtime_disable(dev);

	return r;