diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-07-02 05:48:58 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-07-03 15:42:13 -0400 |
commit | 145eb3321fb8b5411c9e4975eada21515c19ebb0 (patch) | |
tree | 203f399d39555b32da687b702c8004ff87edf910 /drivers/gpu/nvgpu/common/fifo/submit.c | |
parent | 15d5edab4afdf81935b4f79efb66f0410cda86e7 (diff) |
gpu: nvgpu: reject submits when usermode is on
Kernel mode submits conflict with user submits, so don't allow them if a
channel user has asked for usermode submit support.
Bug 200145225
Change-Id: I3a99222b09260a1b3e116c6aa86d8da5d380d903
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1767907
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Sourab Gupta <sourabg@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c index daeee608..f6a79f80 100644 --- a/drivers/gpu/nvgpu/common/fifo/submit.c +++ b/drivers/gpu/nvgpu/common/fifo/submit.c | |||
@@ -322,6 +322,9 @@ static int nvgpu_submit_channel_gpfifo(struct channel_gk20a *c, | |||
322 | if (!nvgpu_mem_is_valid(&c->gpfifo.mem)) | 322 | if (!nvgpu_mem_is_valid(&c->gpfifo.mem)) |
323 | return -ENOMEM; | 323 | return -ENOMEM; |
324 | 324 | ||
325 | if (c->usermode_submit_enabled) | ||
326 | return -EINVAL; | ||
327 | |||
325 | /* fifo not large enough for request. Return error immediately. | 328 | /* fifo not large enough for request. Return error immediately. |
326 | * Kernel can insert gpfifo entries before and after user gpfifos. | 329 | * Kernel can insert gpfifo entries before and after user gpfifos. |
327 | * So, add extra_entries in user request. Also, HW with fifo size N | 330 | * So, add extra_entries in user request. Also, HW with fifo size N |