diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-11-23 17:17:56 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-12-10 11:38:20 -0500 |
commit | e04e73c580976445880283552535199a70a80ea4 (patch) | |
tree | 0c14150c32bb628503e32b3860e6975c3976a73e /drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |
parent | eb81d7d7e1d4a34ecd5968b13636f2c0e7a0dce1 (diff) |
gpu: nvgpu: Immediate channel release
When closing channel, disable and preempt it immediately instead of
waiting for it to finish all work.
Bug 1683059
Change-Id: Ia5f5fc6a072dc3ddb1e9bf63534814ff0a60b5b4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/836746
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index d3428788..cb8ffa95 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -194,9 +194,7 @@ void gk20a_channel_close(struct channel_gk20a *ch); | |||
194 | 194 | ||
195 | bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch, | 195 | bool gk20a_channel_update_and_check_timeout(struct channel_gk20a *ch, |
196 | u32 timeout_delta_ms); | 196 | u32 timeout_delta_ms); |
197 | void gk20a_disable_channel(struct channel_gk20a *ch, | 197 | void gk20a_disable_channel(struct channel_gk20a *ch); |
198 | bool wait_for_finish, | ||
199 | unsigned long finish_timeout); | ||
200 | void gk20a_channel_abort(struct channel_gk20a *ch); | 198 | void gk20a_channel_abort(struct channel_gk20a *ch); |
201 | int gk20a_channel_finish(struct channel_gk20a *ch, unsigned long timeout); | 199 | int gk20a_channel_finish(struct channel_gk20a *ch, unsigned long timeout); |
202 | void gk20a_set_error_notifier(struct channel_gk20a *ch, __u32 error); | 200 | void gk20a_set_error_notifier(struct channel_gk20a *ch, __u32 error); |