summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorseshendra Gadagottu <sgadagottu@nvidia.com>2017-12-05 19:14:37 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-01-18 13:30:24 -0500
commitf8402eb90a68ab1e38ef87166458dc064501a8f9 (patch)
treef8f17725209966fc23a3d985b10fc1553ef9b869 /drivers/gpu/nvgpu/include
parent2deab755e794ab14000a9f6549ee05ce0d0cdb2b (diff)
gpu: nvgpu: gv1xx: remove scg_type from channel info
scg_type for graphics_compute0 and compute1 is deprecated for gv1xx. Remove it from setting in the channel info. Bug 1842197 Change-Id: I37354adcd82bb0ab648e0f04d47de796b79f91cd Signed-off-by: seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1640440 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h8
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h8
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h
index 66a0737c..4b7eb25c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h
@@ -628,14 +628,6 @@ static inline u32 pbdma_set_channel_info_r(u32 i)
628{ 628{
629 return 0x000400fcU + i*8192U; 629 return 0x000400fcU + i*8192U;
630} 630}
631static inline u32 pbdma_set_channel_info_scg_type_graphics_compute0_f(void)
632{
633 return 0x0U;
634}
635static inline u32 pbdma_set_channel_info_scg_type_compute1_f(void)
636{
637 return 0x1U;
638}
639static inline u32 pbdma_set_channel_info_veid_f(u32 v) 631static inline u32 pbdma_set_channel_info_veid_f(u32 v)
640{ 632{
641 return (v & 0x3fU) << 8U; 633 return (v & 0x3fU) << 8U;
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 9b9017ee..f05bee84 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
@@ -628,14 +628,6 @@ static inline u32 pbdma_set_channel_info_r(u32 i)
628{ 628{
629 return 0x000400fcU + i*8192U; 629 return 0x000400fcU + i*8192U;
630} 630}
631static inline u32 pbdma_set_channel_info_scg_type_graphics_compute0_f(void)
632{
633 return 0x0U;
634}
635static inline u32 pbdma_set_channel_info_scg_type_compute1_f(void)
636{
637 return 0x1U;
638}
639static inline u32 pbdma_set_channel_info_veid_f(u32 v) 631static inline u32 pbdma_set_channel_info_veid_f(u32 v)
640{ 632{
641 return (v & 0x3fU) << 8U; 633 return (v & 0x3fU) << 8U;