diff options
author | Richard Zhao <rizhao@nvidia.com> | 2018-03-16 14:11:27 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-29 21:54:02 -0400 |
commit | c5f03db98a20eb4e8b83fd350d293aab6986beff (patch) | |
tree | 2f6d53b0bfac835f8fc24ebf3181cf709f394829 /drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |
parent | 5c27ac91fdde693c6f57100dc7fc6be75cc6982a (diff) |
gpu: nvgpu: add gops.fifo.ch_abort_clean_up
Channel abort clean up is only needed by native and vgpu driver but not
RM server. RM server expects guest will clean up itself. RM server
should not set the callback.
Jira VQRM-3058
Change-Id: I11b49b6f2d51c871e31de16955d487dca82609cb
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1679705
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index bd4e2ff8..e3d9b53a 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -220,7 +220,8 @@ void gk20a_channel_abort(struct channel_gk20a *ch, bool channel_preempt) | |||
220 | if (channel_preempt && gk20a_is_channel_marked_as_tsg(ch)) | 220 | if (channel_preempt && gk20a_is_channel_marked_as_tsg(ch)) |
221 | ch->g->ops.fifo.preempt_channel(ch->g, ch->chid); | 221 | ch->g->ops.fifo.preempt_channel(ch->g, ch->chid); |
222 | 222 | ||
223 | gk20a_channel_abort_clean_up(ch); | 223 | if (ch->g->ops.fifo.ch_abort_clean_up) |
224 | ch->g->ops.fifo.ch_abort_clean_up(ch); | ||
224 | } | 225 | } |
225 | 226 | ||
226 | int gk20a_wait_channel_idle(struct channel_gk20a *ch) | 227 | int gk20a_wait_channel_idle(struct channel_gk20a *ch) |