summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
index 96185ee7..712359e1 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
@@ -23,6 +23,7 @@
23 23
24#include <nvgpu/nvgpu_common.h> 24#include <nvgpu/nvgpu_common.h>
25#include <nvgpu/kmem.h> 25#include <nvgpu/kmem.h>
26#include <nvgpu/log.h>
26 27
27#include "gk20a.h" 28#include "gk20a.h"
28#include "gr_ctx_gk20a.h" 29#include "gr_ctx_gk20a.h"
@@ -111,7 +112,6 @@ static bool gr_gk20a_is_firmware_defined(void)
111 112
112static int gr_gk20a_init_ctx_vars_fw(struct gk20a *g, struct gr_gk20a *gr) 113static int gr_gk20a_init_ctx_vars_fw(struct gk20a *g, struct gr_gk20a *gr)
113{ 114{
114 struct device *d = dev_from_gk20a(g);
115 const struct firmware *netlist_fw; 115 const struct firmware *netlist_fw;
116 struct netlist_image *netlist = NULL; 116 struct netlist_image *netlist = NULL;
117 char name[MAX_NETLIST_NAME]; 117 char name[MAX_NETLIST_NAME];
@@ -135,13 +135,13 @@ static int gr_gk20a_init_ctx_vars_fw(struct gk20a *g, struct gr_gk20a *gr)
135 135
136 for (; net < max; net++) { 136 for (; net < max; net++) {
137 if (g->ops.gr_ctx.get_netlist_name(g, net, name) != 0) { 137 if (g->ops.gr_ctx.get_netlist_name(g, net, name) != 0) {
138 gk20a_warn(d, "invalid netlist index %d", net); 138 nvgpu_warn(g, "invalid netlist index %d", net);
139 continue; 139 continue;
140 } 140 }
141 141
142 netlist_fw = nvgpu_request_firmware(g, name, 0); 142 netlist_fw = nvgpu_request_firmware(g, name, 0);
143 if (!netlist_fw) { 143 if (!netlist_fw) {
144 gk20a_warn(d, "failed to load netlist %s", name); 144 nvgpu_warn(g, "failed to load netlist %s", name);
145 continue; 145 continue;
146 } 146 }
147 147
@@ -436,7 +436,7 @@ done:
436 gk20a_dbg_info("netlist image %s loaded", name); 436 gk20a_dbg_info("netlist image %s loaded", name);
437 return 0; 437 return 0;
438 } else { 438 } else {
439 gk20a_err(d, "failed to load netlist image!!"); 439 nvgpu_err(g, "failed to load netlist image!!");
440 return err; 440 return err;
441 } 441 }
442} 442}