diff options
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 272fadbb..c30a8eaf 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -417,6 +417,7 @@ struct gpu_ops { | |||
417 | void (*device_info_data_parse)(struct gk20a *g, | 417 | void (*device_info_data_parse)(struct gk20a *g, |
418 | u32 table_entry, u32 *inst_id, | 418 | u32 table_entry, u32 *inst_id, |
419 | u32 *pri_base, u32 *fault_id); | 419 | u32 *pri_base, u32 *fault_id); |
420 | u32 (*device_info_fault_id)(u32 table_entry); | ||
420 | int (*tsg_bind_channel)(struct tsg_gk20a *tsg, | 421 | int (*tsg_bind_channel)(struct tsg_gk20a *tsg, |
421 | struct channel_gk20a *ch); | 422 | struct channel_gk20a *ch); |
422 | int (*tsg_unbind_channel)(struct channel_gk20a *ch); | 423 | int (*tsg_unbind_channel)(struct channel_gk20a *ch); |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index d5c5327f..d458d00b 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B fifo | 2 | * GP10B fifo |
3 | * | 3 | * |
4 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -217,11 +217,13 @@ static void gp10b_device_info_data_parse(struct gk20a *g, u32 table_entry, | |||
217 | *pri_base = | 217 | *pri_base = |
218 | (top_device_info_data_pri_base_v(table_entry) | 218 | (top_device_info_data_pri_base_v(table_entry) |
219 | << top_device_info_data_pri_base_align_v()); | 219 | << top_device_info_data_pri_base_align_v()); |
220 | gk20a_dbg_info("device info: pri_base: %d", *pri_base); | ||
220 | } | 221 | } |
221 | if (fault_id && (top_device_info_data_fault_id_v(table_entry) == | 222 | if (fault_id && (top_device_info_data_fault_id_v(table_entry) == |
222 | top_device_info_data_fault_id_valid_v())) { | 223 | top_device_info_data_fault_id_valid_v())) { |
223 | *fault_id = | 224 | *fault_id = |
224 | top_device_info_data_fault_id_enum_v(table_entry); | 225 | g->ops.fifo.device_info_fault_id(table_entry); |
226 | gk20a_dbg_info("device info: fault_id: %d", *fault_id); | ||
225 | } | 227 | } |
226 | } else | 228 | } else |
227 | gk20a_err(g->dev, "unknown device_info_data %d", | 229 | gk20a_err(g->dev, "unknown device_info_data %d", |
@@ -237,4 +239,5 @@ void gp10b_init_fifo(struct gpu_ops *gops) | |||
237 | gops->fifo.engine_enum_from_type = gp10b_fifo_engine_enum_from_type; | 239 | gops->fifo.engine_enum_from_type = gp10b_fifo_engine_enum_from_type; |
238 | gops->fifo.device_info_data_parse = gp10b_device_info_data_parse; | 240 | gops->fifo.device_info_data_parse = gp10b_device_info_data_parse; |
239 | gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v; | 241 | gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v; |
242 | gops->fifo.device_info_fault_id = top_device_info_data_fault_id_enum_v; | ||
240 | } | 243 | } |