diff options
| author | Pranav Chaturvedi <pchaturvedi@nvidia.com> | 2012-04-16 09:09:44 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-05-04 13:39:00 -0700 |
| commit | 91eb75c90ef8acd92573ca5145fee67f1781719f (patch) | |
| tree | 49fae22af143ddc07f0e11428140ae8ff41b6e30 | |
| parent | 8d709aefa05d224373c0337f1aa35c39fd50431c (diff) | |
video: early exit from update_cdma
when update_cdma_locked() is invoked, CDMA is not running
implies that the queue is cleared and we can return immediately.
Bug 960487
Change-Id: I599027906dc405f4490590443d4f4d5a3202b5b0
Reviewed-on: http://git-master/r/96650
(cherry picked from commit f297b4812d15540f4b14c87178662a7ca6575ce9)
Reviewed-on: http://git-master/r/99994
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
| -rw-r--r-- | drivers/video/tegra/host/nvhost_cdma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/nvhost_cdma.c b/drivers/video/tegra/host/nvhost_cdma.c index 7ebb0c8b4020..f1f4405d0745 100644 --- a/drivers/video/tegra/host/nvhost_cdma.c +++ b/drivers/video/tegra/host/nvhost_cdma.c @@ -156,7 +156,9 @@ static void update_cdma_locked(struct nvhost_cdma *cdma) struct nvhost_syncpt *sp = &dev->syncpt; struct nvhost_job *job, *n; - BUG_ON(!cdma->running); + /* If CDMA is stopped, queue is cleared and we can return */ + if (!cdma->running) + return; /* * Walk the sync queue, reading the sync point registers as necessary, |