From bb72b7e2ed215b26e1d9b94534c24ab4cfa52801 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 6 Apr 2017 11:01:46 -0700 Subject: gpu: nvgpu: gm20b: Use new error macros gk20a_err() and gk20a_warn() require a struct device pointer, which is not portable across operating systems. The new nvgpu_err() and nvgpu_warn() macros take struct gk20a pointer. Convert code to use the more portable macros. JIRA NVGPU-16 Change-Id: Ic27fb98e03a982e5a1cf672cb4e8f87ecea10a5b Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1457345 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/fifo_gm20b.c') diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index 6c34689b..e3aa43d6 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c @@ -21,6 +21,7 @@ #include "fifo_gm20b.h" #include +#include #include #include @@ -64,7 +65,7 @@ static inline u32 gm20b_engine_id_to_mmu_id(struct gk20a *g, u32 engine_id) if (engine_info) { fault_id = engine_info->fault_id; } else { - gk20a_err(g->dev, "engine_id is not in active list/invalid %d", engine_id); + nvgpu_err(g, "engine_id is not in active list/invalid %d", engine_id); } return fault_id; } @@ -80,8 +81,7 @@ static void gm20b_fifo_trigger_mmu_fault(struct gk20a *g, /* trigger faults for all bad engines */ for_each_set_bit(engine_id, &engine_ids, 32) { if (!gk20a_fifo_is_valid_engine_id(g, engine_id)) { - gk20a_err(dev_from_gk20a(g), - "faulting unknown engine %ld", engine_id); + nvgpu_err(g, "faulting unknown engine %ld", engine_id); } else { u32 mmu_id = gm20b_engine_id_to_mmu_id(g, engine_id); @@ -107,7 +107,7 @@ static void gm20b_fifo_trigger_mmu_fault(struct gk20a *g, } while (!nvgpu_timeout_expired(&timeout)); if (ret) - gk20a_err(dev_from_gk20a(g), "mmu fault timeout"); + nvgpu_err(g, "mmu fault timeout"); /* release mmu fault trigger */ for_each_set_bit(engine_id, &engine_ids, 32) @@ -136,7 +136,7 @@ static void gm20b_device_info_data_parse(struct gk20a *g, top_device_info_data_fault_id_enum_v(table_entry); } } else - gk20a_err(g->dev, "unknown device_info_data %d", + nvgpu_err(g, "unknown device_info_data %d", top_device_info_data_type_v(table_entry)); } -- cgit v1.2.2