diff options
author | Seema Khowala <seemaj@nvidia.com> | 2018-10-19 15:08:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2019-02-13 16:19:37 -0500 |
commit | 220860d04383489a8e75684802a2ced1323831df (patch) | |
tree | 123e92d8b1781afa6de32bc2615ae5835b389f4d /drivers/gpu/nvgpu/common/fifo/submit.c | |
parent | 18643ac1357a845d204d6dabd98359a0ab0509a7 (diff) |
gpu: nvgpu: rename has_timedout and make it thread safe
Currently has_timedout variable is protected by wmb at places
where it is being set and there is no correspoding rmb whenever
has_timedout variable is read. This is prone to errors for
concurrent execution. This change is supposed to fix this issue.
Rename has_timedout variable of channel struct to ch_timedout.
Also to avoid rmb every time ch_timedout is read,
ch_timedout_spinlock is added to protect ch_timedout
variable for taking care of concurrent execution.
Bug 2404865
Bug 2092051
Change-Id: I0bee9f50af0a48720aa8b54cbc3af97ef9f6df00
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1930935
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
(cherry picked from commit 1f54ea09e3445d9ca3cf7a69b4967849cc9defc8
in dev-kernel)
Reviewed-on: https://git-master.nvidia.com/r/2016975
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
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/submit.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/fifo/submit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c index 5e218fbc..599539cd 100644 --- a/drivers/gpu/nvgpu/common/fifo/submit.c +++ b/drivers/gpu/nvgpu/common/fifo/submit.c | |||
@@ -336,7 +336,7 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c, | |||
336 | return -ENODEV; | 336 | return -ENODEV; |
337 | } | 337 | } |
338 | 338 | ||
339 | if (c->has_timedout) { | 339 | if (gk20a_channel_check_timedout(c)) { |
340 | return -ETIMEDOUT; | 340 | return -ETIMEDOUT; |
341 | } | 341 | } |
342 | 342 | ||
@@ -504,7 +504,7 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c, | |||
504 | } | 504 | } |
505 | } | 505 | } |
506 | 506 | ||
507 | if (c->has_timedout) { | 507 | if (gk20a_channel_check_timedout(c)) { |
508 | err = -ETIMEDOUT; | 508 | err = -ETIMEDOUT; |
509 | goto clean_up; | 509 | goto clean_up; |
510 | } | 510 | } |