diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 427403e3..82a510e9 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -71,9 +71,9 @@ | |||
71 | 71 | ||
72 | #define PRIV_SECURITY_DISABLE 0x01 | 72 | #define PRIV_SECURITY_DISABLE 0x01 |
73 | 73 | ||
74 | int gm20b_get_litter_value(struct gk20a *g, int value) | 74 | u32 gm20b_get_litter_value(struct gk20a *g, int value) |
75 | { | 75 | { |
76 | int ret = EINVAL; | 76 | u32 ret = EINVAL; |
77 | switch (value) { | 77 | switch (value) { |
78 | case GPU_LIT_NUM_GPCS: | 78 | case GPU_LIT_NUM_GPCS: |
79 | ret = proj_scal_litter_num_gpcs_v(); | 79 | ret = proj_scal_litter_num_gpcs_v(); |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h b/drivers/gpu/nvgpu/gm20b/hal_gm20b.h index 5deb7ef5..ec6b4e96 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.h | |||
@@ -27,5 +27,5 @@ | |||
27 | struct gk20a; | 27 | struct gk20a; |
28 | 28 | ||
29 | int gm20b_init_hal(struct gk20a *g); | 29 | int gm20b_init_hal(struct gk20a *g); |
30 | int gm20b_get_litter_value(struct gk20a *g, int value); | 30 | u32 gm20b_get_litter_value(struct gk20a *g, int value); |
31 | #endif /* NVGPU_GM20B_HAL_GM20B_H */ | 31 | #endif /* NVGPU_GM20B_HAL_GM20B_H */ |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index c0f2fd57..3786b588 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -106,9 +106,9 @@ | |||
106 | #include <nvgpu/hw/gp106/hw_gr_gp106.h> | 106 | #include <nvgpu/hw/gp106/hw_gr_gp106.h> |
107 | 107 | ||
108 | 108 | ||
109 | static int gp106_get_litter_value(struct gk20a *g, int value) | 109 | static u32 gp106_get_litter_value(struct gk20a *g, int value) |
110 | { | 110 | { |
111 | int ret = -EINVAL; | 111 | u32 ret = EINVAL; |
112 | 112 | ||
113 | switch (value) { | 113 | switch (value) { |
114 | case GPU_LIT_NUM_GPCS: | 114 | case GPU_LIT_NUM_GPCS: |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 68dfcfe4..1050c89f 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -88,9 +88,9 @@ | |||
88 | #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h> | 88 | #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h> |
89 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | 89 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> |
90 | 90 | ||
91 | int gp10b_get_litter_value(struct gk20a *g, int value) | 91 | u32 gp10b_get_litter_value(struct gk20a *g, int value) |
92 | { | 92 | { |
93 | int ret = EINVAL; | 93 | u32 ret = EINVAL; |
94 | switch (value) { | 94 | switch (value) { |
95 | case GPU_LIT_NUM_GPCS: | 95 | case GPU_LIT_NUM_GPCS: |
96 | ret = proj_scal_litter_num_gpcs_v(); | 96 | ret = proj_scal_litter_num_gpcs_v(); |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h b/drivers/gpu/nvgpu/gp10b/hal_gp10b.h index 6ba80b88..13103c17 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.h | |||
@@ -27,5 +27,5 @@ | |||
27 | struct gk20a; | 27 | struct gk20a; |
28 | 28 | ||
29 | int gp10b_init_hal(struct gk20a *gops); | 29 | int gp10b_init_hal(struct gk20a *gops); |
30 | int gp10b_get_litter_value(struct gk20a *g, int value); | 30 | u32 gp10b_get_litter_value(struct gk20a *g, int value); |
31 | #endif /* NVGPU_HAL_GP10B_H */ | 31 | #endif /* NVGPU_HAL_GP10B_H */ |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 3c3e5742..aecebf79 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -125,9 +125,9 @@ | |||
125 | #include <nvgpu/hw/gv100/hw_pwr_gv100.h> | 125 | #include <nvgpu/hw/gv100/hw_pwr_gv100.h> |
126 | #include <nvgpu/hw/gv100/hw_gr_gv100.h> | 126 | #include <nvgpu/hw/gv100/hw_gr_gv100.h> |
127 | 127 | ||
128 | static int gv100_get_litter_value(struct gk20a *g, int value) | 128 | static u32 gv100_get_litter_value(struct gk20a *g, int value) |
129 | { | 129 | { |
130 | int ret = EINVAL; | 130 | u32 ret = EINVAL; |
131 | switch (value) { | 131 | switch (value) { |
132 | case GPU_LIT_NUM_GPCS: | 132 | case GPU_LIT_NUM_GPCS: |
133 | ret = proj_scal_litter_num_gpcs_v(); | 133 | ret = proj_scal_litter_num_gpcs_v(); |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 986d3b82..0ee0e6c8 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -104,9 +104,9 @@ | |||
104 | #include <nvgpu/hw/gv11b/hw_pwr_gv11b.h> | 104 | #include <nvgpu/hw/gv11b/hw_pwr_gv11b.h> |
105 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> | 105 | #include <nvgpu/hw/gv11b/hw_gr_gv11b.h> |
106 | 106 | ||
107 | int gv11b_get_litter_value(struct gk20a *g, int value) | 107 | u32 gv11b_get_litter_value(struct gk20a *g, int value) |
108 | { | 108 | { |
109 | int ret = EINVAL; | 109 | u32 ret = EINVAL; |
110 | switch (value) { | 110 | switch (value) { |
111 | case GPU_LIT_NUM_GPCS: | 111 | case GPU_LIT_NUM_GPCS: |
112 | ret = proj_scal_litter_num_gpcs_v(); | 112 | ret = proj_scal_litter_num_gpcs_v(); |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.h b/drivers/gpu/nvgpu/gv11b/hal_gv11b.h index d5b7ad01..b10cc727 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.h | |||
@@ -27,5 +27,5 @@ | |||
27 | struct gk20a; | 27 | struct gk20a; |
28 | 28 | ||
29 | int gv11b_init_hal(struct gk20a *gops); | 29 | int gv11b_init_hal(struct gk20a *gops); |
30 | int gv11b_get_litter_value(struct gk20a *g, int value); | 30 | u32 gv11b_get_litter_value(struct gk20a *g, int value); |
31 | #endif /* NVGPU_HAL_GV11B_H */ | 31 | #endif /* NVGPU_HAL_GV11B_H */ |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index a7fe1c2f..2ebe0011 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h | |||
@@ -1194,7 +1194,7 @@ struct gpu_ops { | |||
1194 | int (*perfbuffer_disable)(struct gk20a *g); | 1194 | int (*perfbuffer_disable)(struct gk20a *g); |
1195 | } dbg_session_ops; | 1195 | } dbg_session_ops; |
1196 | 1196 | ||
1197 | int (*get_litter_value)(struct gk20a *g, int value); | 1197 | u32 (*get_litter_value)(struct gk20a *g, int value); |
1198 | int (*chip_init_gpu_characteristics)(struct gk20a *g); | 1198 | int (*chip_init_gpu_characteristics)(struct gk20a *g); |
1199 | 1199 | ||
1200 | struct { | 1200 | struct { |