diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c index fb8686c2..1f7a7694 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c | |||
@@ -31,6 +31,8 @@ | |||
31 | #include <nvgpu/hashtable.h> | 31 | #include <nvgpu/hashtable.h> |
32 | #include <nvgpu/nvhost.h> | 32 | #include <nvgpu/nvhost.h> |
33 | 33 | ||
34 | #include "os_linux.h" | ||
35 | |||
34 | #include "clk.h" | 36 | #include "clk.h" |
35 | 37 | ||
36 | #include "gk20a/platform_gk20a.h" | 38 | #include "gk20a/platform_gk20a.h" |
@@ -610,10 +612,10 @@ void gp10b_ecc_stat_remove(struct device *dev, | |||
610 | nvgpu_kfree(g, dev_attr_array); | 612 | nvgpu_kfree(g, dev_attr_array); |
611 | } | 613 | } |
612 | 614 | ||
613 | void gr_gp10b_create_sysfs(struct device *dev) | 615 | void gr_gp10b_create_sysfs(struct gk20a *g) |
614 | { | 616 | { |
615 | int error = 0; | 617 | int error = 0; |
616 | struct gk20a *g = get_gk20a(dev); | 618 | struct device *dev = dev_from_gk20a(g); |
617 | 619 | ||
618 | /* This stat creation function is called on GR init. GR can get | 620 | /* This stat creation function is called on GR init. GR can get |
619 | initialized multiple times but we only need to create the ECC | 621 | initialized multiple times but we only need to create the ECC |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 20e0450e..7e7d9688 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -356,7 +356,7 @@ struct gpu_ops { | |||
356 | u32 gpc_exception); | 356 | u32 gpc_exception); |
357 | void (*enable_gpc_exceptions)(struct gk20a *g); | 357 | void (*enable_gpc_exceptions)(struct gk20a *g); |
358 | void (*enable_exceptions)(struct gk20a *g); | 358 | void (*enable_exceptions)(struct gk20a *g); |
359 | void (*create_gr_sysfs)(struct device *dev); | 359 | void (*create_gr_sysfs)(struct gk20a *g); |
360 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); | 360 | u32 (*get_lrf_tex_ltc_dram_override)(struct gk20a *g); |
361 | int (*record_sm_error_state)(struct gk20a *g, | 361 | int (*record_sm_error_state)(struct gk20a *g, |
362 | u32 gpc, u32 tpc); | 362 | u32 gpc, u32 tpc); |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index a95368c3..e30c595e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -4865,7 +4865,7 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g) | |||
4865 | gr->sw_ready = true; | 4865 | gr->sw_ready = true; |
4866 | 4866 | ||
4867 | if (g->ops.gr.create_gr_sysfs) | 4867 | if (g->ops.gr.create_gr_sysfs) |
4868 | g->ops.gr.create_gr_sysfs(dev_from_gk20a(g)); | 4868 | g->ops.gr.create_gr_sysfs(g); |
4869 | 4869 | ||
4870 | gk20a_dbg_fn("done"); | 4870 | gk20a_dbg_fn("done"); |
4871 | return 0; | 4871 | return 0; |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h index a537f147..45ac5305 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.h | |||
@@ -56,7 +56,7 @@ enum { | |||
56 | int gr_gp10b_init_fs_state(struct gk20a *g); | 56 | int gr_gp10b_init_fs_state(struct gk20a *g); |
57 | int gr_gp10b_alloc_buffer(struct vm_gk20a *vm, size_t size, | 57 | int gr_gp10b_alloc_buffer(struct vm_gk20a *vm, size_t size, |
58 | struct nvgpu_mem *mem); | 58 | struct nvgpu_mem *mem); |
59 | void gr_gp10b_create_sysfs(struct device *dev); | 59 | void gr_gp10b_create_sysfs(struct gk20a *g); |
60 | int gr_gp10b_handle_fecs_error(struct gk20a *g, | 60 | int gr_gp10b_handle_fecs_error(struct gk20a *g, |
61 | struct channel_gk20a *__ch, | 61 | struct channel_gk20a *__ch, |
62 | struct gr_gk20a_isr_data *isr_data); | 62 | struct gr_gk20a_isr_data *isr_data); |