summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
diff options
context:
space:
mode:
authorSeema Khowala <seemaj@nvidia.com>2017-03-01 13:36:53 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-02 11:53:38 -0500
commit3c3f947cf4a7d2db72f3bb3e2f7eab4d7d926a30 (patch)
tree80747c20d4daeccee7e299307a617e6b68ef860e /drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
parent0aafa9e279da0fdcca19b610a57919fd00ad35aa (diff)
gpu: nvgpu: add fifo ops for *data_fault_id_enum_v
generated hw header for top_device_info_data_fault_id_enum_v is different between legacy chips and t19x JIRA GV11B-7 Change-Id: I877e88a5b1b1f3f41bc72b895536f4a01b4fbd4e Signed-off-by: Seema Khowala <seemaj@nvidia.com> Reviewed-on: http://git-master/r/1313384 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/fifo_gp10b.c')
-rw-r--r--drivers/gpu/nvgpu/gp10b/fifo_gp10b.c7
1 files changed, 5 insertions, 2 deletions
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}