diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 58570d6d..dd9cb3ce 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -298,6 +298,7 @@ struct gpu_ops { | |||
298 | bool enable); | 298 | bool enable); |
299 | int (*update_hwpm_ctxsw_mode)(struct gk20a *g, | 299 | int (*update_hwpm_ctxsw_mode)(struct gk20a *g, |
300 | struct channel_gk20a *c, | 300 | struct channel_gk20a *c, |
301 | u64 gpu_va, | ||
301 | bool enable); | 302 | bool enable); |
302 | int (*dump_gr_regs)(struct gk20a *g, | 303 | int (*dump_gr_regs)(struct gk20a *g, |
303 | struct gk20a_debug_output *o); | 304 | struct gk20a_debug_output *o); |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index a02c0e5d..94bfd224 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -1722,6 +1722,7 @@ out: | |||
1722 | 1722 | ||
1723 | int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g, | 1723 | int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g, |
1724 | struct channel_gk20a *c, | 1724 | struct channel_gk20a *c, |
1725 | u64 gpu_va, | ||
1725 | bool enable_hwpm_ctxsw) | 1726 | bool enable_hwpm_ctxsw) |
1726 | { | 1727 | { |
1727 | struct tsg_gk20a *tsg; | 1728 | struct tsg_gk20a *tsg; |
@@ -1787,8 +1788,9 @@ int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g, | |||
1787 | return ret; | 1788 | return ret; |
1788 | } | 1789 | } |
1789 | 1790 | ||
1790 | pm_ctx->mem.gpu_va = nvgpu_gmmu_map(c->vm, | 1791 | pm_ctx->mem.gpu_va = nvgpu_gmmu_map_fixed(c->vm, |
1791 | &pm_ctx->mem, | 1792 | &pm_ctx->mem, |
1793 | gpu_va, | ||
1792 | pm_ctx->mem.size, | 1794 | pm_ctx->mem.size, |
1793 | NVGPU_VM_MAP_CACHEABLE, | 1795 | NVGPU_VM_MAP_CACHEABLE, |
1794 | gk20a_mem_flag_none, true, | 1796 | gk20a_mem_flag_none, true, |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index e4eb6c4a..7f89037e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -643,6 +643,7 @@ int gr_gk20a_update_smpc_ctxsw_mode(struct gk20a *g, | |||
643 | bool enable_smpc_ctxsw); | 643 | bool enable_smpc_ctxsw); |
644 | int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g, | 644 | int gr_gk20a_update_hwpm_ctxsw_mode(struct gk20a *g, |
645 | struct channel_gk20a *c, | 645 | struct channel_gk20a *c, |
646 | u64 gpu_va, | ||
646 | bool enable_hwpm_ctxsw); | 647 | bool enable_hwpm_ctxsw); |
647 | 648 | ||
648 | struct nvgpu_gr_ctx; | 649 | struct nvgpu_gr_ctx; |