summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
authorTimo Alho <talho@nvidia.com>2014-12-04 03:53:17 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:12:26 -0400
commit31a436b3a1720f0ff3ab51d102c55c09c7e247fd (patch)
tree602eea3c57e1d841de4a681527910a50a8fe3404 /drivers/gpu/nvgpu/gk20a/channel_gk20a.c
parent383f176a9db510e51a04b2dc00fad47aa0a1ed6b (diff)
Revert "gpu: nvgpu: Enable syncpt reclaim only on gm20b"
This reverts commit 8eefb93c21934b101d7f423c38d9ea384a45fad6. Bug 1585422 Change-Id: I217e0ffe6c230ee3c63d9aec1c48ce9c41770468 Signed-off-by: Timo Alho <talho@nvidia.com> Reviewed-on: http://git-master/r/659426
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 03163575..de51e83e 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -318,7 +318,6 @@ static void channel_gk20a_bind(struct channel_gk20a *ch_gk20a)
318void channel_gk20a_unbind(struct channel_gk20a *ch_gk20a) 318void channel_gk20a_unbind(struct channel_gk20a *ch_gk20a)
319{ 319{
320 struct gk20a *g = ch_gk20a->g; 320 struct gk20a *g = ch_gk20a->g;
321 struct gk20a_platform *platform = gk20a_get_platform(g->dev);
322 321
323 gk20a_dbg_fn(""); 322 gk20a_dbg_fn("");
324 323
@@ -334,7 +333,7 @@ void channel_gk20a_unbind(struct channel_gk20a *ch_gk20a)
334 * resource at this point 333 * resource at this point
335 * if not, then it will be destroyed at channel_free() 334 * if not, then it will be destroyed at channel_free()
336 */ 335 */
337 if (ch_gk20a->sync && platform->sync_aggressive_destroy) { 336 if (ch_gk20a->sync && ch_gk20a->sync->aggressive_destroy) {
338 ch_gk20a->sync->destroy(ch_gk20a->sync); 337 ch_gk20a->sync->destroy(ch_gk20a->sync);
339 ch_gk20a->sync = NULL; 338 ch_gk20a->sync = NULL;
340 } 339 }
@@ -1470,7 +1469,6 @@ void gk20a_channel_update(struct channel_gk20a *c, int nr_completed)
1470{ 1469{
1471 struct vm_gk20a *vm = c->vm; 1470 struct vm_gk20a *vm = c->vm;
1472 struct channel_gk20a_job *job, *n; 1471 struct channel_gk20a_job *job, *n;
1473 struct gk20a_platform *platform = gk20a_get_platform(c->g->dev);
1474 1472
1475 trace_gk20a_channel_update(c); 1473 trace_gk20a_channel_update(c);
1476 1474
@@ -1508,7 +1506,7 @@ void gk20a_channel_update(struct channel_gk20a *c, int nr_completed)
1508 * the sync resource 1506 * the sync resource
1509 */ 1507 */
1510 if (list_empty(&c->jobs)) { 1508 if (list_empty(&c->jobs)) {
1511 if (c->sync && platform->sync_aggressive_destroy && 1509 if (c->sync && c->sync->aggressive_destroy &&
1512 gk20a_fence_is_expired(c->last_submit.post_fence)) { 1510 gk20a_fence_is_expired(c->last_submit.post_fence)) {
1513 c->sync->destroy(c->sync); 1511 c->sync->destroy(c->sync);
1514 c->sync = NULL; 1512 c->sync = NULL;