diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h index 83dd17db5..c8591835a 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h @@ -87,7 +87,6 @@ enum { TEGRA_VGPU_CMD_CHANNEL_FREE_HWPM_CTX = 47, TEGRA_VGPU_CMD_GR_CTX_ALLOC = 48, TEGRA_VGPU_CMD_GR_CTX_FREE = 49, - TEGRA_VGPU_CMD_TSG_BIND_GR_CTX = 51, TEGRA_VGPU_CMD_TSG_BIND_CHANNEL = 52, TEGRA_VGPU_CMD_TSG_UNBIND_CHANNEL = 53, TEGRA_VGPU_CMD_TSG_PREEMPT = 54, @@ -403,11 +402,6 @@ struct tegra_vgpu_gr_ctx_params { u32 tsg_id; }; -struct tegra_vgpu_tsg_bind_gr_ctx_params { - u32 tsg_id; - u64 gr_ctx_handle; -}; - struct tegra_vgpu_tsg_bind_unbind_channel_params { u32 tsg_id; u64 ch_handle; @@ -655,7 +649,6 @@ struct tegra_vgpu_cmd_msg { struct tegra_vgpu_channel_set_ctxsw_mode set_ctxsw_mode; struct tegra_vgpu_channel_free_hwpm_ctx free_hwpm_ctx; struct tegra_vgpu_gr_ctx_params gr_ctx; - struct tegra_vgpu_tsg_bind_gr_ctx_params tsg_bind_gr_ctx; struct tegra_vgpu_tsg_bind_unbind_channel_params tsg_bind_unbind_channel; struct tegra_vgpu_tsg_open_rel_params tsg_open; struct tegra_vgpu_tsg_open_rel_params tsg_release; diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index 8b6ce1ed0..cefe6f7b5 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c @@ -450,25 +450,6 @@ void vgpu_gr_free_gr_ctx(struct gk20a *g, } } -static int vgpu_gr_tsg_bind_gr_ctx(struct tsg_gk20a *tsg) -{ - struct nvgpu_gr_ctx *gr_ctx = tsg->gr_ctx; - struct tegra_vgpu_cmd_msg msg = {0}; - struct tegra_vgpu_tsg_bind_gr_ctx_params *p = - &msg.params.tsg_bind_gr_ctx; - int err; - - msg.cmd = TEGRA_VGPU_CMD_TSG_BIND_GR_CTX; - msg.handle = vgpu_get_handle(tsg->g); - p->tsg_id = tsg->tsgid; - p->gr_ctx_handle = gr_ctx->virt_ctx; - err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg)); - err = err ? err : msg.ret; - WARN_ON(err); - - return err; -} - int vgpu_gr_alloc_obj_ctx(struct channel_gk20a *c, u32 class_num, u32 flags) { struct gk20a *g = c->g; @@ -505,10 +486,6 @@ int vgpu_gr_alloc_obj_ctx(struct channel_gk20a *c, u32 class_num, u32 flags) gr_ctx->tsgid = tsg->tsgid; err = g->ops.gr.alloc_gr_ctx(g, gr_ctx, c->vm); - if (!err) { - gr_ctx->tsgid = tsg->tsgid; - err = vgpu_gr_tsg_bind_gr_ctx(tsg); - } if (err) { nvgpu_err(g, "fail to allocate TSG gr ctx buffer, err=%d", err);