From f8402eb90a68ab1e38ef87166458dc064501a8f9 Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Tue, 5 Dec 2017 16:14:37 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1640440 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h | 8 -------- drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h | 8 -------- 2 files changed, 16 deletions(-) (limited to 'drivers/gpu/nvgpu/include') 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) { return 0x000400fcU + i*8192U; } -static inline u32 pbdma_set_channel_info_scg_type_graphics_compute0_f(void) -{ - return 0x0U; -} -static inline u32 pbdma_set_channel_info_scg_type_compute1_f(void) -{ - return 0x1U; -} static inline u32 pbdma_set_channel_info_veid_f(u32 v) { 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) { return 0x000400fcU + i*8192U; } -static inline u32 pbdma_set_channel_info_scg_type_graphics_compute0_f(void) -{ - return 0x0U; -} -static inline u32 pbdma_set_channel_info_scg_type_compute1_f(void) -{ - return 0x1U; -} static inline u32 pbdma_set_channel_info_veid_f(u32 v) { return (v & 0x3fU) << 8U; -- cgit v1.2.2