diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-10-05 15:18:20 +0300 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-10-13 12:50:41 -0700 |
| commit | f40fe779ee2997c38a990b7270e55705517de574 (patch) | |
| tree | 514a3f43045a6efb6d6efbad06c748419bcd39a0 | |
| parent | fff41a7bcd9868f1c51fe5d53a1348ff28061771 (diff) | |
nvhost: Wait for CDMA to end before freeing channel
Wait for CDMA to become idle before freeing resources associated with a
channel.
Bug 877665
Change-Id: I1a25f98ba8620202d349a4c6af38fa0e20839751
Reviewed-on: http://git-master/r/56653
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Gerrit_Virtual_Submit
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Reviewed-by: Antti Miettinen <amiettinen@nvidia.com>
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/host/nvhost_channel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/nvhost_channel.c b/drivers/video/tegra/host/nvhost_channel.c index 163046a36219..ca8ec45452c5 100644 --- a/drivers/video/tegra/host/nvhost_channel.c +++ b/drivers/video/tegra/host/nvhost_channel.c @@ -74,11 +74,9 @@ void nvhost_putchannel(struct nvhost_channel *ch, struct nvhost_hwctx *ctx) mutex_lock(&ch->reflock); if (ch->refcount == 1) { - nvhost_module_deinit(&ch->dev->pdev->dev, &ch->mod); - /* cdma may already be stopped, that's ok */ - channel_cdma_op(ch).stop(&ch->cdma); nvhost_cdma_deinit(&ch->cdma); + nvhost_module_deinit(&ch->dev->pdev->dev, &ch->mod); } ch->refcount--; mutex_unlock(&ch->reflock); |