summaryrefslogtreecommitdiff
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 9e032e03a153..d5a3bbd34a78 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -1,7 +1,7 @@
/*
* GK20A Graphics
*
- * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -2697,7 +2697,6 @@ void gk20a_free_channel_ctx(struct channel_gk20a *c)
memset(&c->ch_ctx, 0, sizeof(struct channel_ctx_gk20a));
- c->num_objects = 0;
c->first_init = false;
}
@@ -2848,8 +2847,6 @@ int gk20a_alloc_obj_ctx(struct channel_gk20a *c,
c->first_init = true;
}
- c->num_objects++;
-
gk20a_dbg_fn("done");
return 0;
out:
@@ -2861,29 +2858,6 @@ out:
return err;
}
-int gk20a_free_obj_ctx(struct channel_gk20a *c,
- struct nvhost_free_obj_ctx_args *args)
-{
- unsigned long timeout = gk20a_get_gr_idle_timeout(c->g);
-
- gk20a_dbg_fn("");
-
- if (c->num_objects == 0)
- return 0;
-
- c->num_objects--;
-
- if (c->num_objects == 0) {
- c->first_init = false;
- gk20a_disable_channel(c,
- !c->has_timedout,
- timeout);
- gr_gk20a_unmap_channel_patch_ctx(c);
- }
-
- return 0;
-}
-
static void gk20a_remove_gr_support(struct gr_gk20a *gr)
{
struct gk20a *g = gr->g;