diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-02-07 18:58:01 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-02-13 20:54:28 -0500 |
commit | 8497f45a2ed8599053ad0be99143c8effb510acf (patch) | |
tree | 21c193047bedb6f5e3b6cbb186f7842adfbc50b4 /drivers | |
parent | 83c09ff6821fc8f549e857c2c4a2ef6b494497f9 (diff) |
nvgpu: gpu: gv11b: Remove syncpt protection support
In gv11b sync point support is moved to a shim outside of GPU,
and gv11b does not support sync points anymore. Remove use of
the sync point protection.
JIRA GV11B-47
JIRA GV11B-2
Change-Id: I70f3d2ce0cfe016453efe03f2bbf64c59baeb154
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1300964
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h | 26 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h | 4 |
3 files changed, 2 insertions, 29 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index ab32016e..cd6007ba 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | |||
@@ -228,6 +228,7 @@ void gv11b_init_fifo(struct gpu_ops *gops) | |||
228 | gops->fifo.userd_gp_get = gv11b_userd_gp_get; | 228 | gops->fifo.userd_gp_get = gv11b_userd_gp_get; |
229 | gops->fifo.userd_gp_put = gv11b_userd_gp_put; | 229 | gops->fifo.userd_gp_put = gv11b_userd_gp_put; |
230 | gops->fifo.setup_ramfc = channel_gv11b_setup_ramfc; | 230 | gops->fifo.setup_ramfc = channel_gv11b_setup_ramfc; |
231 | gops->fifo.resetup_ramfc = NULL; | ||
231 | gops->fifo.unbind_channel = channel_gv11b_unbind; | 232 | gops->fifo.unbind_channel = channel_gv11b_unbind; |
232 | gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v; | 233 | gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v; |
233 | gops->fifo.free_channel_ctx_header = gv11b_free_subctx_header; | 234 | gops->fifo.free_channel_ctx_header = gv11b_free_subctx_header; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h index c4d3a631..7aea3870 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -518,30 +518,6 @@ static inline u32 pbdma_udma_nop_r(void) | |||
518 | { | 518 | { |
519 | return 0x00000008; | 519 | return 0x00000008; |
520 | } | 520 | } |
521 | static inline u32 pbdma_allowed_syncpoints_r(u32 i) | ||
522 | { | ||
523 | return 0x000400e8 + i*8192; | ||
524 | } | ||
525 | static inline u32 pbdma_allowed_syncpoints_0_valid_f(u32 v) | ||
526 | { | ||
527 | return (v & 0x1) << 31; | ||
528 | } | ||
529 | static inline u32 pbdma_allowed_syncpoints_0_index_f(u32 v) | ||
530 | { | ||
531 | return (v & 0x7fff) << 16; | ||
532 | } | ||
533 | static inline u32 pbdma_allowed_syncpoints_0_index_v(u32 r) | ||
534 | { | ||
535 | return (r >> 16) & 0x7fff; | ||
536 | } | ||
537 | static inline u32 pbdma_allowed_syncpoints_1_valid_f(u32 v) | ||
538 | { | ||
539 | return (v & 0x1) << 15; | ||
540 | } | ||
541 | static inline u32 pbdma_allowed_syncpoints_1_index_f(u32 v) | ||
542 | { | ||
543 | return (v & 0x7fff) << 0; | ||
544 | } | ||
545 | static inline u32 pbdma_runlist_timeslice_r(u32 i) | 521 | static inline u32 pbdma_runlist_timeslice_r(u32 i) |
546 | { | 522 | { |
547 | return 0x000400f8 + i*8192; | 523 | return 0x000400f8 + i*8192; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h index bcbb7b81..69de33c6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h | |||
@@ -546,10 +546,6 @@ static inline u32 ram_fc_subdevice_w(void) | |||
546 | { | 546 | { |
547 | return 37; | 547 | return 37; |
548 | } | 548 | } |
549 | static inline u32 ram_fc_allowed_syncpoints_w(void) | ||
550 | { | ||
551 | return 58; | ||
552 | } | ||
553 | static inline u32 ram_fc_target_w(void) | 549 | static inline u32 ram_fc_target_w(void) |
554 | { | 550 | { |
555 | return 43; | 551 | return 43; |