diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vin.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fuse/fuse_gp106.c | 26 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 |
4 files changed, 20 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 67eeffd5..d57522af 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c | |||
@@ -102,8 +102,8 @@ u32 clk_avfs_get_vin_cal_fuse_v20(struct gk20a *g, | |||
102 | if (pvinobjs->calibration_rev_vbios == g->ops.fuse.read_vin_cal_fuse_rev(g)) { | 102 | if (pvinobjs->calibration_rev_vbios == g->ops.fuse.read_vin_cal_fuse_rev(g)) { |
103 | BOARDOBJGRP_FOR_EACH(&(pvinobjs->super.super), | 103 | BOARDOBJGRP_FOR_EACH(&(pvinobjs->super.super), |
104 | struct vin_device_v20 *, pvindev, i) { | 104 | struct vin_device_v20 *, pvindev, i) { |
105 | gain = 0; | 105 | gain = '\0'; |
106 | offset = 0; | 106 | offset = '\0'; |
107 | pvindev = (struct vin_device_v20 *)CLK_GET_VIN_DEVICE(pvinobjs, i); | 107 | pvindev = (struct vin_device_v20 *)CLK_GET_VIN_DEVICE(pvinobjs, i); |
108 | status = g->ops.fuse.read_vin_cal_gain_offset_fuse(g, | 108 | status = g->ops.fuse.read_vin_cal_gain_offset_fuse(g, |
109 | pvindev->super.id, &gain, &offset); | 109 | pvindev->super.id, &gain, &offset); |
@@ -268,7 +268,7 @@ static u32 devinit_get_vin_device_table(struct gk20a *g, | |||
268 | u8 *vin_tbl_entry_ptr = NULL; | 268 | u8 *vin_tbl_entry_ptr = NULL; |
269 | u32 index = 0; | 269 | u32 index = 0; |
270 | u32 slope=0, intercept=0; | 270 | u32 slope=0, intercept=0; |
271 | s8 offset=0, gain=0; | 271 | s8 offset='\0', gain='\0'; |
272 | struct vin_device *pvin_dev; | 272 | struct vin_device *pvin_dev; |
273 | u32 cal_type; | 273 | u32 cal_type; |
274 | 274 | ||
diff --git a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c index 17951e27..47dc49ab 100644 --- a/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c +++ b/drivers/gpu/nvgpu/common/fuse/fuse_gp106.c | |||
@@ -181,50 +181,54 @@ u32 gp106_fuse_read_vin_cal_gain_offset_fuse(struct gk20a *g, | |||
181 | u32 vin_id, s8 *gain, | 181 | u32 vin_id, s8 *gain, |
182 | s8 *offset) | 182 | s8 *offset) |
183 | { | 183 | { |
184 | u32 reg_val = 0; | ||
184 | u32 data = 0; | 185 | u32 data = 0; |
185 | 186 | ||
186 | switch (vin_id) { | 187 | switch (vin_id) { |
187 | case CTRL_CLK_VIN_ID_GPC0: | 188 | case CTRL_CLK_VIN_ID_GPC0: |
188 | data = gk20a_readl(g, fuse_vin_cal_gpc0_r()); | 189 | reg_val = gk20a_readl(g, fuse_vin_cal_gpc0_r()); |
189 | break; | 190 | break; |
190 | 191 | ||
191 | case CTRL_CLK_VIN_ID_GPC1: | 192 | case CTRL_CLK_VIN_ID_GPC1: |
192 | data = gk20a_readl(g, fuse_vin_cal_gpc1_delta_r()); | 193 | reg_val = gk20a_readl(g, fuse_vin_cal_gpc1_delta_r()); |
193 | break; | 194 | break; |
194 | 195 | ||
195 | case CTRL_CLK_VIN_ID_GPC2: | 196 | case CTRL_CLK_VIN_ID_GPC2: |
196 | data = gk20a_readl(g, fuse_vin_cal_gpc2_delta_r()); | 197 | reg_val = gk20a_readl(g, fuse_vin_cal_gpc2_delta_r()); |
197 | break; | 198 | break; |
198 | 199 | ||
199 | case CTRL_CLK_VIN_ID_GPC3: | 200 | case CTRL_CLK_VIN_ID_GPC3: |
200 | data = gk20a_readl(g, fuse_vin_cal_gpc3_delta_r()); | 201 | reg_val = gk20a_readl(g, fuse_vin_cal_gpc3_delta_r()); |
201 | break; | 202 | break; |
202 | 203 | ||
203 | case CTRL_CLK_VIN_ID_GPC4: | 204 | case CTRL_CLK_VIN_ID_GPC4: |
204 | data = gk20a_readl(g, fuse_vin_cal_gpc4_delta_r()); | 205 | reg_val = gk20a_readl(g, fuse_vin_cal_gpc4_delta_r()); |
205 | break; | 206 | break; |
206 | 207 | ||
207 | case CTRL_CLK_VIN_ID_GPC5: | 208 | case CTRL_CLK_VIN_ID_GPC5: |
208 | data = gk20a_readl(g, fuse_vin_cal_gpc5_delta_r()); | 209 | reg_val = gk20a_readl(g, fuse_vin_cal_gpc5_delta_r()); |
209 | break; | 210 | break; |
210 | 211 | ||
211 | case CTRL_CLK_VIN_ID_SYS: | 212 | case CTRL_CLK_VIN_ID_SYS: |
212 | case CTRL_CLK_VIN_ID_XBAR: | 213 | case CTRL_CLK_VIN_ID_XBAR: |
213 | case CTRL_CLK_VIN_ID_LTC: | 214 | case CTRL_CLK_VIN_ID_LTC: |
214 | data = gk20a_readl(g, fuse_vin_cal_shared_delta_r()); | 215 | reg_val = gk20a_readl(g, fuse_vin_cal_shared_delta_r()); |
215 | break; | 216 | break; |
216 | 217 | ||
217 | case CTRL_CLK_VIN_ID_SRAM: | 218 | case CTRL_CLK_VIN_ID_SRAM: |
218 | data = gk20a_readl(g, fuse_vin_cal_sram_delta_r()); | 219 | reg_val = gk20a_readl(g, fuse_vin_cal_sram_delta_r()); |
219 | break; | 220 | break; |
220 | 221 | ||
221 | default: | 222 | default: |
222 | return -EINVAL; | 223 | return -EINVAL; |
223 | } | 224 | } |
224 | if (data == 0xFFFFFFFF) | 225 | if (reg_val == 0xFFFFFFFF) { |
225 | return -EINVAL; | 226 | return -EINVAL; |
226 | *gain = (s8) (data >> 16) & 0x1f; | 227 | } |
227 | *offset = (s8) data & 0x7f; | 228 | data = (reg_val >> 16U) & 0x1fU; |
229 | *gain = (s8)data; | ||
230 | data = reg_val & 0x7fU; | ||
231 | *offset = (s8)data; | ||
228 | 232 | ||
229 | return 0; | 233 | return 0; |
230 | } | 234 | } |
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c index a0b9013f..9c487d6d 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | |||
@@ -169,7 +169,7 @@ int __nvgpu_alloc_common_init(struct nvgpu_allocator *a, struct gk20a *g, | |||
169 | a->debug = dbg; | 169 | a->debug = dbg; |
170 | 170 | ||
171 | strncpy(a->name, name, sizeof(a->name)); | 171 | strncpy(a->name, name, sizeof(a->name)); |
172 | a->name[sizeof(a->name) - 1] = 0; | 172 | a->name[sizeof(a->name) - 1U] = '\0'; |
173 | 173 | ||
174 | return 0; | 174 | return 0; |
175 | } | 175 | } |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index dcaf11b1..9ec4c867 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -96,7 +96,7 @@ static void print_pmu_trace(struct nvgpu_pmu *pmu) | |||
96 | if (k >= 40) | 96 | if (k >= 40) |
97 | break; | 97 | break; |
98 | strncpy(part_str, (trace+i+20+m), k); | 98 | strncpy(part_str, (trace+i+20+m), k); |
99 | part_str[k] = 0; | 99 | part_str[k] = '\0'; |
100 | count += scnprintf((buf + count), 0x40, "%s0x%x", | 100 | count += scnprintf((buf + count), 0x40, "%s0x%x", |
101 | part_str, trace1[(i / 4) + 1 + l]); | 101 | part_str, trace1[(i / 4) + 1 + l]); |
102 | l++; | 102 | l++; |