Unverified Commit 2d192f4a authored by Lucas Stach's avatar Lucas Stach Committed by Robert Foss
Browse files

drm/bridge: analogix_dp: register AUX bus after enabling runtime PM 



AUX transactions require the controller to be in working state and
take a runtime PM reference. To avoid potential races beween the
first transactions on the bus and runtime PM being set up, move the
AUX registration behind the runtime PM setup.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Reviewed-by: default avatarRobert Foss <rfoss@kernel.org>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarRobert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240619182200.3752465-3-l.stach@pengutronix.de
parent c91b5bd7

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

+11 −8
Original line number Diff line number Diff line
@@ -1721,31 +1721,34 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev) 
	dp->drm_dev = drm_dev;

	dp->encoder = dp->plat_data->encoder;



	pm_runtime_use_autosuspend(dp->dev);

	pm_runtime_set_autosuspend_delay(dp->dev, 100);

	pm_runtime_enable(dp->dev);



	dp->aux.name = "DP-AUX";

	dp->aux.transfer = analogix_dpaux_transfer;

	dp->aux.dev = dp->dev;

	dp->aux.drm_dev = drm_dev;



	ret = drm_dp_aux_register(&dp->aux);

	if (ret)

		return ret;



	pm_runtime_use_autosuspend(dp->dev);

	pm_runtime_set_autosuspend_delay(dp->dev, 100);

	pm_runtime_enable(dp->dev);

	if (ret) {

		DRM_ERROR("failed to register AUX (%d)\n", ret);

		goto err_disable_pm_runtime;

	}



	ret = analogix_dp_create_bridge(drm_dev, dp);

	if (ret) {

		DRM_ERROR("failed to create bridge (%d)\n", ret);

		goto err_disable_pm_runtime;

		goto err_unregister_aux;

	}



	return 0;



err_unregister_aux:

	drm_dp_aux_unregister(&dp->aux);

err_disable_pm_runtime:

	pm_runtime_dont_use_autosuspend(dp->dev);

	pm_runtime_disable(dp->dev);

	drm_dp_aux_unregister(&dp->aux);



	return ret;

}