diff options
author | Ken Adams <kadams@nvidia.com> | 2014-04-10 11:33:30 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:42 -0400 |
commit | a9f75f87937a2d9ad88bbd992ee3d5c91c18c260 (patch) | |
tree | 6168b263c03d7422848d0e3a46a9d254bfd1406e | |
parent | 824e256c2af97a325475a3601cde0f3d6e3fc2a3 (diff) |
gpu: nvgpu: gk20a: minor fixes
fixes one use of unitialized var
renames a register to make it match dev_* file.
Change-Id: Iafba659bbf2df509e0b494b2c5dab3819bf650ef
Signed-off-by: Ken Adams <kadams@nvidia.com>
Reviewed-on: http://git-master/r/394792
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index aedd2055..e6bdf52c 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -338,7 +338,7 @@ static int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long end_jiffies, | |||
338 | 338 | ||
339 | if (!gr_status_fe_method_upper_v(val) && | 339 | if (!gr_status_fe_method_upper_v(val) && |
340 | !gr_status_fe_method_lower_v(val) && | 340 | !gr_status_fe_method_lower_v(val) && |
341 | !gr_status_fe_method_fe_gi_v(val)) { | 341 | !gr_status_fe_gi_v(val)) { |
342 | gk20a_dbg_fn("done"); | 342 | gk20a_dbg_fn("done"); |
343 | return 0; | 343 | return 0; |
344 | } | 344 | } |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 8e2a62de..0f1af8ab 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -2663,7 +2663,7 @@ static int pmu_handle_perfmon_event(struct pmu_gk20a *pmu, | |||
2663 | 2663 | ||
2664 | static int pmu_handle_event(struct pmu_gk20a *pmu, struct pmu_msg *msg) | 2664 | static int pmu_handle_event(struct pmu_gk20a *pmu, struct pmu_msg *msg) |
2665 | { | 2665 | { |
2666 | int err; | 2666 | int err = 0; |
2667 | 2667 | ||
2668 | gk20a_dbg_fn(""); | 2668 | gk20a_dbg_fn(""); |
2669 | 2669 | ||