Unverified Commit dfb02eb6 authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Robert Foss
Browse files

drm/bridge: anx7625: Fix NULL pointer crash when using edp-panel 



Move devm_of_dp_aux_populate_ep_devices() after pm runtime and i2c setup
to avoid NULL pointer crash.

edp-panel probe (generic_edp_panel_probe) calls pm_runtime_get_sync() to
read EDID. At this time, bridge should have pm runtime enabled and i2c
clients ready.

Fixes: adca62ec ("drm/bridge: anx7625: Support reading edid through aux channel")
Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarXin Ji <xji@analogixsemi.com>
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220706125254.2474095-4-hsinyi@chromium.org
parent aa196597

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

+9 −8
Original line number Original line Diff line number Diff line
@@ -2590,14 +2590,6 @@ static int anx7625_i2c_probe(struct i2c_client *client, 
	platform->aux.dev = dev;

	platform->aux.dev = dev;

	platform->aux.transfer = anx7625_aux_transfer;

	platform->aux.transfer = anx7625_aux_transfer;

	drm_dp_aux_init(&platform->aux);

	drm_dp_aux_init(&platform->aux);

	devm_of_dp_aux_populate_ep_devices(&platform->aux);



	ret = anx7625_parse_dt(dev, pdata);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev, "fail to parse DT : %d\n", ret);

		goto free_wq;

	}





	if (anx7625_register_i2c_dummy_clients(platform, client) != 0) {

	if (anx7625_register_i2c_dummy_clients(platform, client) != 0) {

		ret = -ENOMEM;

		ret = -ENOMEM;
@@ -2613,6 +2605,15 @@ static int anx7625_i2c_probe(struct i2c_client *client, 
	if (ret)

	if (ret)

		goto free_wq;

		goto free_wq;





	devm_of_dp_aux_populate_ep_devices(&platform->aux);



	ret = anx7625_parse_dt(dev, pdata);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			DRM_DEV_ERROR(dev, "fail to parse DT : %d\n", ret);

		goto free_wq;

	}



	if (!platform->pdata.low_power_mode) {

	if (!platform->pdata.low_power_mode) {

		anx7625_disable_pd_protocol(platform);

		anx7625_disable_pd_protocol(platform);

		pm_runtime_get_sync(dev);

		pm_runtime_get_sync(dev);