summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index e3d9b53a..8b9f02df 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -41,6 +41,7 @@
41#include <nvgpu/ctxsw_trace.h> 41#include <nvgpu/ctxsw_trace.h>
42#include <nvgpu/error_notifier.h> 42#include <nvgpu/error_notifier.h>
43#include <nvgpu/os_sched.h> 43#include <nvgpu/os_sched.h>
44#include <nvgpu/log2.h>
44 45
45#include "gk20a.h" 46#include "gk20a.h"
46#include "dbg_gpu_gk20a.h" 47#include "dbg_gpu_gk20a.h"
@@ -288,7 +289,6 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
288 struct dbg_session_gk20a *dbg_s; 289 struct dbg_session_gk20a *dbg_s;
289 struct dbg_session_data *session_data, *tmp_s; 290 struct dbg_session_data *session_data, *tmp_s;
290 struct dbg_session_channel_data *ch_data, *tmp; 291 struct dbg_session_channel_data *ch_data, *tmp;
291 bool was_tsg = false;
292 int err; 292 int err;
293 293
294 gk20a_dbg_fn(""); 294 gk20a_dbg_fn("");
@@ -313,13 +313,6 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
313 nvgpu_err(g, 313 nvgpu_err(g,
314 "failed to unbind channel %d from TSG", 314 "failed to unbind channel %d from TSG",
315 ch->chid); 315 ch->chid);
316 /*
317 * Channel is not a part of TSG this point onwards
318 * So stash its status and use it whenever necessary
319 * e.g. while releasing gr_ctx in
320 * g->ops.gr.free_channel_ctx()
321 */
322 was_tsg = true;
323 } else { 316 } else {
324 gk20a_disable_channel(ch); 317 gk20a_disable_channel(ch);
325 } 318 }