diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/gv11b')
4 files changed, 6 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c index 710e4b90..475036ee 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c | |||
@@ -30,7 +30,7 @@ int vgpu_gv11b_fifo_alloc_syncpt_buf(struct channel_gk20a *c, | |||
30 | struct gk20a *g = c->g; | 30 | struct gk20a *g = c->g; |
31 | struct vm_gk20a *vm = c->vm; | 31 | struct vm_gk20a *vm = c->vm; |
32 | struct tegra_vgpu_cmd_msg msg = {}; | 32 | struct tegra_vgpu_cmd_msg msg = {}; |
33 | struct tegra_vgpu_map_syncpt_params *p = &msg.params.t19x.map_syncpt; | 33 | struct tegra_vgpu_map_syncpt_params *p = &msg.params.map_syncpt; |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Add ro map for complete sync point shim range in vm. | 36 | * Add ro map for complete sync point shim range in vm. |
@@ -97,15 +97,9 @@ int vgpu_gv11b_fifo_alloc_syncpt_buf(struct channel_gk20a *c, | |||
97 | int vgpu_gv11b_init_fifo_setup_hw(struct gk20a *g) | 97 | int vgpu_gv11b_init_fifo_setup_hw(struct gk20a *g) |
98 | { | 98 | { |
99 | struct fifo_gk20a *f = &g->fifo; | 99 | struct fifo_gk20a *f = &g->fifo; |
100 | int err; | 100 | struct vgpu_priv_data *priv = vgpu_get_priv_data(g); |
101 | 101 | ||
102 | err = vgpu_get_attribute(vgpu_get_handle(g), | 102 | f->t19x.max_subctx_count = priv->constants.max_subctx_count; |
103 | TEGRA_VGPU_ATTRIB_MAX_SUBCTX_COUNT, | ||
104 | &f->t19x.max_subctx_count); | ||
105 | if (err) { | ||
106 | nvgpu_err(g, "get max_subctx_count failed %d", err); | ||
107 | return err; | ||
108 | } | ||
109 | 103 | ||
110 | return 0; | 104 | return 0; |
111 | } | 105 | } |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c index f6302d15..968eae10 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "common/linux/vgpu/dbg_vgpu.h" | 25 | #include "common/linux/vgpu/dbg_vgpu.h" |
26 | #include "common/linux/vgpu/fecs_trace_vgpu.h" | 26 | #include "common/linux/vgpu/fecs_trace_vgpu.h" |
27 | #include "common/linux/vgpu/css_vgpu.h" | 27 | #include "common/linux/vgpu/css_vgpu.h" |
28 | #include "common/linux/vgpu/vgpu_t19x.h" | ||
29 | #include "common/linux/vgpu/gm20b/vgpu_gr_gm20b.h" | 28 | #include "common/linux/vgpu/gm20b/vgpu_gr_gm20b.h" |
30 | #include "common/linux/vgpu/gp10b/vgpu_mm_gp10b.h" | 29 | #include "common/linux/vgpu/gp10b/vgpu_mm_gp10b.h" |
31 | #include "common/linux/vgpu/gp10b/vgpu_gr_gp10b.h" | 30 | #include "common/linux/vgpu/gp10b/vgpu_gr_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c index 1e2de14d..d59f0381 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c | |||
@@ -24,7 +24,7 @@ int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
24 | struct ctx_header_desc *ctx = &c->ch_ctx.ctx_header; | 24 | struct ctx_header_desc *ctx = &c->ch_ctx.ctx_header; |
25 | struct tegra_vgpu_cmd_msg msg = {}; | 25 | struct tegra_vgpu_cmd_msg msg = {}; |
26 | struct tegra_vgpu_alloc_ctx_header_params *p = | 26 | struct tegra_vgpu_alloc_ctx_header_params *p = |
27 | &msg.params.t19x.alloc_ctx_header; | 27 | &msg.params.alloc_ctx_header; |
28 | int err; | 28 | int err; |
29 | 29 | ||
30 | msg.cmd = TEGRA_VGPU_CMD_ALLOC_CTX_HEADER; | 30 | msg.cmd = TEGRA_VGPU_CMD_ALLOC_CTX_HEADER; |
@@ -55,7 +55,7 @@ void vgpu_gv11b_free_subctx_header(struct channel_gk20a *c) | |||
55 | struct ctx_header_desc *ctx = &c->ch_ctx.ctx_header; | 55 | struct ctx_header_desc *ctx = &c->ch_ctx.ctx_header; |
56 | struct tegra_vgpu_cmd_msg msg = {}; | 56 | struct tegra_vgpu_cmd_msg msg = {}; |
57 | struct tegra_vgpu_free_ctx_header_params *p = | 57 | struct tegra_vgpu_free_ctx_header_params *p = |
58 | &msg.params.t19x.free_ctx_header; | 58 | &msg.params.free_ctx_header; |
59 | int err; | 59 | int err; |
60 | 60 | ||
61 | if (ctx->mem.gpu_va) { | 61 | if (ctx->mem.gpu_va) { |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c index 094ccc44..c2e01218 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c | |||
@@ -25,7 +25,7 @@ int vgpu_gv11b_tsg_bind_channel(struct tsg_gk20a *tsg, | |||
25 | { | 25 | { |
26 | struct tegra_vgpu_cmd_msg msg = {}; | 26 | struct tegra_vgpu_cmd_msg msg = {}; |
27 | struct tegra_vgpu_tsg_bind_channel_ex_params *p = | 27 | struct tegra_vgpu_tsg_bind_channel_ex_params *p = |
28 | &msg.params.t19x.tsg_bind_channel_ex; | 28 | &msg.params.tsg_bind_channel_ex; |
29 | int err; | 29 | int err; |
30 | 30 | ||
31 | gk20a_dbg_fn(""); | 31 | gk20a_dbg_fn(""); |