Commit b1044a9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert drm/vc4 hdmi runtime PM changes 

This reverts commits

  9984d666 ("drm/vc4: hdmi: Make sure the controller is powered in detect")
  411efa18 ("drm/vc4: hdmi: Move the HSM clock enable to runtime_pm")

as Michael Stapelberg reports that the new runtime PM changes cause his
Raspberry Pi 3 to hang on boot, probably due to interactions with other
changes in the DRM tree (because a bisect points to the merge in commit
e058a84b: "Merge tag 'drm-next-2021-07-01' of git://.../drm").

Revert these two commits until it's been resolved.

Link: https://lore.kernel.org/all/871r5mp7h2.fsf@midna.i-did-not-set--mail-host-address--so-tickle-me/


Reported-and-tested-by: default avatarMichael Stapelberg <michael@stapelberg.ch>
Cc: Maxime Ripard <maxime@cerno.tech>
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4d016ca

drivers/gpu/drm/vc4/vc4_hdmi.c

+10 −34
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) 
	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);

	bool connected = false;



	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));



	if (vc4_hdmi->hpd_gpio &&

	    gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio)) {

		connected = true;
@@ -189,12 +187,10 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) 
			}

		}



		pm_runtime_put(&vc4_hdmi->pdev->dev);

		return connector_status_connected;

	}



	cec_phys_addr_invalidate(vc4_hdmi->cec_adap);

	pm_runtime_put(&vc4_hdmi->pdev->dev);

	return connector_status_disconnected;

}
@@ -635,6 +631,7 @@ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder, 
		vc4_hdmi->variant->phy_disable(vc4_hdmi);



	clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);

	clk_disable_unprepare(vc4_hdmi->hsm_clock);

	clk_disable_unprepare(vc4_hdmi->pixel_clock);



	ret = pm_runtime_put(&vc4_hdmi->pdev->dev);
@@ -947,6 +944,13 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, 
		return;

	}



	ret = clk_prepare_enable(vc4_hdmi->hsm_clock);

	if (ret) {

		DRM_ERROR("Failed to turn on HSM clock: %d\n", ret);

		clk_disable_unprepare(vc4_hdmi->pixel_clock);

		return;

	}



	vc4_hdmi_cec_update_clk_div(vc4_hdmi);



	if (pixel_rate > 297000000)
@@ -959,6 +963,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, 
	ret = clk_set_min_rate(vc4_hdmi->pixel_bvb_clock, bvb_rate);

	if (ret) {

		DRM_ERROR("Failed to set pixel bvb clock rate: %d\n", ret);

		clk_disable_unprepare(vc4_hdmi->hsm_clock);

		clk_disable_unprepare(vc4_hdmi->pixel_clock);

		return;

	}
@@ -966,6 +971,7 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder, 
	ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);

	if (ret) {

		DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);

		clk_disable_unprepare(vc4_hdmi->hsm_clock);

		clk_disable_unprepare(vc4_hdmi->pixel_clock);

		return;

	}
@@ -2114,29 +2120,6 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) 
	return 0;

}



#ifdef CONFIG_PM

static int vc4_hdmi_runtime_suspend(struct device *dev)

{

	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);



	clk_disable_unprepare(vc4_hdmi->hsm_clock);



	return 0;

}



static int vc4_hdmi_runtime_resume(struct device *dev)

{

	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);

	int ret;



	ret = clk_prepare_enable(vc4_hdmi->hsm_clock);

	if (ret)

		return ret;



	return 0;

}

#endif



static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)

{

	const struct vc4_hdmi_variant *variant = of_device_get_match_data(dev);
@@ -2391,18 +2374,11 @@ static const struct of_device_id vc4_hdmi_dt_match[] = { 
	{}

};



static const struct dev_pm_ops vc4_hdmi_pm_ops = {

	SET_RUNTIME_PM_OPS(vc4_hdmi_runtime_suspend,

			   vc4_hdmi_runtime_resume,

			   NULL)

};



struct platform_driver vc4_hdmi_driver = {

	.probe = vc4_hdmi_dev_probe,

	.remove = vc4_hdmi_dev_remove,

	.driver = {

		.name = "vc4_hdmi",

		.of_match_table = vc4_hdmi_dt_match,

		.pm = &vc4_hdmi_pm_ops,

	},

};