diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2016-12-19 06:01:43 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-12-27 04:24:35 -0500 |
commit | 505b442551a2e27aa3bc9e608c5a2bc9fccecbc4 (patch) | |
tree | 5b4d1d9664ab819e009fc9300784b897be035058 /drivers/gpu/nvgpu/vgpu | |
parent | f3d2dd4fd2c3d0fa3f774bcbc1d2b9ef482d7663 (diff) |
gpu: nvgpu: acquire mutex for notifier read
We use &ch->error_notifier_mutex to protect
writes and free of error notifier
But we currently do not protect reading of
notifier in gk20a_fifo_set_ctx_mmu_error()
and vgpu_fifo_set_ctx_mmu_error()
Add new API gk20a_set_error_notifier_locked()
which is same as gk20a_set_error_notifier()
but without the locks.
In *_fifo_set_ctx_mmu_error() APIs, acquire
the mutex explicitly, and then use this new
API
gk20a_set_error_notifier() will now just call
gk20a_set_error_notifier_locked() within
a mutex
Bug 1824788
Bug 1844312
Change-Id: I1f3831dc63fe1daa761b2e17e4de3c155f505d6f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1273471
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index 5ffc6a00..e9a2d582 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -678,17 +678,20 @@ static int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch, | |||
678 | static void vgpu_fifo_set_ctx_mmu_error(struct gk20a *g, | 678 | static void vgpu_fifo_set_ctx_mmu_error(struct gk20a *g, |
679 | struct channel_gk20a *ch) | 679 | struct channel_gk20a *ch) |
680 | { | 680 | { |
681 | if (ch->error_notifier) { | 681 | mutex_lock(&ch->error_notifier_mutex); |
682 | if (ch->error_notifier_ref) { | ||
682 | if (ch->error_notifier->status == 0xffff) { | 683 | if (ch->error_notifier->status == 0xffff) { |
683 | /* If error code is already set, this mmu fault | 684 | /* If error code is already set, this mmu fault |
684 | * was triggered as part of recovery from other | 685 | * was triggered as part of recovery from other |
685 | * error condition. | 686 | * error condition. |
686 | * Don't overwrite error flag. */ | 687 | * Don't overwrite error flag. */ |
687 | } else { | 688 | } else { |
688 | gk20a_set_error_notifier(ch, | 689 | gk20a_set_error_notifier_locked(ch, |
689 | NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT); | 690 | NVGPU_CHANNEL_FIFO_ERROR_MMU_ERR_FLT); |
690 | } | 691 | } |
691 | } | 692 | } |
693 | mutex_unlock(&ch->error_notifier_mutex); | ||
694 | |||
692 | /* mark channel as faulted */ | 695 | /* mark channel as faulted */ |
693 | ch->has_timedout = true; | 696 | ch->has_timedout = true; |
694 | wmb(); | 697 | wmb(); |