summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/fifo/channel.c
diff options
context:
space:
mode:
authorDebarshi Dutta <ddutta@nvidia.com>2018-11-22 23:00:17 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2019-02-11 11:18:33 -0500
commit5b8ecbc51fe2e94a233c2c42d497b05c2eccdaf5 (patch)
treebce75e5e83f4370d763478587acca0faba786cbd /drivers/gpu/nvgpu/common/fifo/channel.c
parent7e8ba851a826f398fb722b9ff26d6fd40f3226ce (diff)
gpu: nvgpu: replace tsgid input variable with pointer to a struct tsg_gk20a
replace tsgid with a pointer to a struct tsg_gk20a in the function gk20a_fifo_tsg_abort(). gk20a_fifo_tsg_abort needs to enumerate through all the channels within the tsg as well as pass the tsg pointer to other functions, qualifying the need to use a pointer instead as an input parameter. Jira NVGPU-1461 Change-Id: I59cec05d5d778f733d0c3e9ffadf46e74e249080 Signed-off-by: Debarshi Dutta <ddutta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1956567 (cherry picked from commit e5bebd880f28fe719c5e01e165fb189e7cafee01 in dev-kernel) Reviewed-on: https://git-master.nvidia.com/r/2013724 Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/fifo/channel.c')
-rw-r--r--drivers/gpu/nvgpu/common/fifo/channel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 45c02a75..6ac8e508 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -214,10 +214,12 @@ void gk20a_channel_abort_clean_up(struct channel_gk20a *ch)
214 214
215void gk20a_channel_abort(struct channel_gk20a *ch, bool channel_preempt) 215void gk20a_channel_abort(struct channel_gk20a *ch, bool channel_preempt)
216{ 216{
217 struct tsg_gk20a *tsg = tsg_gk20a_from_ch(ch);
218
217 nvgpu_log_fn(ch->g, " "); 219 nvgpu_log_fn(ch->g, " ");
218 220
219 if (gk20a_is_channel_marked_as_tsg(ch)) { 221 if (tsg != NULL) {
220 return gk20a_fifo_abort_tsg(ch->g, ch->tsgid, channel_preempt); 222 return gk20a_fifo_abort_tsg(ch->g, tsg, channel_preempt);
221 } 223 }
222 224
223 /* make sure new kickoffs are prevented */ 225 /* make sure new kickoffs are prevented */