diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 2949c426..07863ac7 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -349,7 +349,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force) | |||
349 | if (!nvgpu_is_enabled(g, NVGPU_DRIVER_IS_DYING)) { | 349 | if (!nvgpu_is_enabled(g, NVGPU_DRIVER_IS_DYING)) { |
350 | /* abort channel and remove from runlist */ | 350 | /* abort channel and remove from runlist */ |
351 | if (gk20a_is_channel_marked_as_tsg(ch)) { | 351 | if (gk20a_is_channel_marked_as_tsg(ch)) { |
352 | err = g->ops.fifo.tsg_unbind_channel(ch); | 352 | err = gk20a_tsg_unbind_channel(ch); |
353 | if (err) | 353 | if (err) |
354 | nvgpu_err(g, | 354 | nvgpu_err(g, |
355 | "failed to unbind channel %d from TSG", | 355 | "failed to unbind channel %d from TSG", |
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 19d0ecce..ccb456cf 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -150,7 +150,7 @@ int gk20a_tsg_unbind_channel(struct channel_gk20a *ch) | |||
150 | struct tsg_gk20a *tsg = &g->fifo.tsg[ch->tsgid]; | 150 | struct tsg_gk20a *tsg = &g->fifo.tsg[ch->tsgid]; |
151 | int err; | 151 | int err; |
152 | 152 | ||
153 | err = gk20a_fifo_tsg_unbind_channel(ch); | 153 | err = g->ops.fifo.tsg_unbind_channel(ch); |
154 | if (err) { | 154 | if (err) { |
155 | nvgpu_err(g, "Channel %d unbind failed, tearing down TSG %d", | 155 | nvgpu_err(g, "Channel %d unbind failed, tearing down TSG %d", |
156 | ch->chid, tsg->tsgid); | 156 | ch->chid, tsg->tsgid); |