Unverified Commit 887ddf32 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: v3d: Switch to devm_pm_runtime_enable 



devm_pm_runtime_enable() simplifies the driver a bit since it will call
pm_runtime_disable() automatically through a device-managed action.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-70-maxime@cerno.tech
parent 266cff37

drivers/gpu/drm/vc4/vc4_v3d.c

+4 −7
Original line number Diff line number Diff line
@@ -468,11 +468,13 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data) 
		return ret;

	vc4->irq = ret;



	pm_runtime_enable(dev);

	ret = devm_pm_runtime_enable(dev);

	if (ret)

		return ret;



	ret = pm_runtime_resume_and_get(dev);

	if (ret)

		goto err_disable_runtime_pm;

		return ret;



	if (V3D_READ(V3D_IDENT0) != V3D_EXPECTED_IDENT0) {

		DRM_ERROR("V3D_IDENT0 read 0x%08x instead of 0x%08x\n",
@@ -501,9 +503,6 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data) 
err_put_runtime_pm:

	pm_runtime_put(dev);



err_disable_runtime_pm:

	pm_runtime_disable(dev);



	return ret;

}
@@ -513,8 +512,6 @@ static void vc4_v3d_unbind(struct device *dev, struct device *master, 
	struct drm_device *drm = dev_get_drvdata(master);

	struct vc4_dev *vc4 = to_vc4_dev(drm);



	pm_runtime_disable(dev);



	vc4_irq_uninstall(drm);



	/* Disable the binner's overflow memory address, so the next