Commit 1e15f5b9 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

drm/tegra: vic: Stop channel on suspend 



CDMA must be stopped before hardware is suspended. Add channel stopping
to RPM suspend callback. Add system level suspend-resume callbacks.

Runtime PM initialization is moved to host1x client init phase because
RPM callback now uses host1x channel that is available only when host1x
client is registered.

Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 2421b20d

drivers/gpu/drm/tegra/vic.c

+18 −18
Original line number Diff line number Diff line
@@ -152,9 +152,13 @@ static int vic_init(struct host1x_client *client) 
		goto free_channel;

	}



	pm_runtime_enable(client->dev);

	pm_runtime_use_autosuspend(client->dev);

	pm_runtime_set_autosuspend_delay(client->dev, 500);



	err = tegra_drm_register_client(tegra, drm);

	if (err < 0)

		goto free_syncpt;

		goto disable_rpm;



	/*

	 * Inherit the DMA parameters (such as maximum segment size) from the
@@ -164,7 +168,10 @@ static int vic_init(struct host1x_client *client) 


	return 0;



free_syncpt:

disable_rpm:

	pm_runtime_dont_use_autosuspend(client->dev);

	pm_runtime_force_suspend(client->dev);



	host1x_syncpt_put(client->syncpts[0]);

free_channel:

	host1x_channel_put(vic->channel);
@@ -189,10 +196,15 @@ static int vic_exit(struct host1x_client *client) 
	if (err < 0)

		return err;



	pm_runtime_dont_use_autosuspend(client->dev);

	pm_runtime_force_suspend(client->dev);



	host1x_syncpt_put(client->syncpts[0]);

	host1x_channel_put(vic->channel);

	host1x_client_iommu_detach(client);



	vic->channel = NULL;



	if (client->group) {

		dma_unmap_single(vic->dev, vic->falcon.firmware.phys,

				 vic->falcon.firmware.size, DMA_TO_DEVICE);
@@ -316,6 +328,8 @@ static int vic_runtime_suspend(struct device *dev) 
	struct vic *vic = dev_get_drvdata(dev);

	int err;



	host1x_channel_stop(vic->channel);



	err = reset_control_assert(vic->rst);

	if (err < 0)

		return err;
@@ -483,19 +497,8 @@ static int vic_probe(struct platform_device *pdev) 
		goto exit_falcon;

	}



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {

		err = vic_runtime_resume(&pdev->dev);

		if (err < 0)

			goto unregister_client;

	}

	pm_runtime_set_autosuspend_delay(&pdev->dev, 500);

	pm_runtime_use_autosuspend(&pdev->dev);



	return 0;



unregister_client:

	host1x_client_unregister(&vic->client.base);

exit_falcon:

	falcon_exit(&vic->falcon);
@@ -514,11 +517,6 @@ static int vic_remove(struct platform_device *pdev) 
		return err;

	}



	if (pm_runtime_enabled(&pdev->dev))

		pm_runtime_disable(&pdev->dev);

	else

		vic_runtime_suspend(&pdev->dev);



	falcon_exit(&vic->falcon);



	return 0;
@@ -526,6 +524,8 @@ static int vic_remove(struct platform_device *pdev) 


static const struct dev_pm_ops vic_pm_ops = {

	SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};



struct platform_driver tegra_vic_driver = {