From 5e90bf3f6c35361cacc1ce8588c3120091d54f58 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Mon, 27 Aug 2018 14:16:59 +0300 Subject: gpu: nvgpu: remove ctx header desc type The graphics subctx header object is nothing but memory. Drop the dependency to gr header file in the channel header file and substitute struct nvgpu_mem for struct ctx_header_desc. Jira NVGPU-967 Change-Id: Ic3976391016c42d2ada4aac3e0851a1222244ce9 Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1807370 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/gv11b') diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c index b536d15e..b5272ae1 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_subctx_gv11b.c @@ -29,7 +29,7 @@ int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) { - struct ctx_header_desc *ctx = &c->ctx_header; + struct nvgpu_mem *ctxheader = &c->ctx_header; struct tegra_vgpu_cmd_msg msg = {}; struct tegra_vgpu_alloc_ctx_header_params *p = &msg.params.alloc_ctx_header; @@ -53,20 +53,20 @@ int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) GMMU_PAGE_SIZE_KERNEL); return err; } - ctx->mem.gpu_va = p->ctx_header_va; + ctxheader->gpu_va = p->ctx_header_va; return err; } void vgpu_gv11b_free_subctx_header(struct channel_gk20a *c) { - struct ctx_header_desc *ctx = &c->ctx_header; + struct nvgpu_mem *ctxheader = &c->ctx_header; struct tegra_vgpu_cmd_msg msg = {}; struct tegra_vgpu_free_ctx_header_params *p = &msg.params.free_ctx_header; int err; - if (ctx->mem.gpu_va) { + if (ctxheader->gpu_va) { msg.cmd = TEGRA_VGPU_CMD_FREE_CTX_HEADER; msg.handle = vgpu_get_handle(c->g); p->ch_handle = c->virt_ctx; @@ -74,8 +74,8 @@ void vgpu_gv11b_free_subctx_header(struct channel_gk20a *c) err = err ? err : msg.ret; if (unlikely(err)) nvgpu_err(c->g, "free ctx_header failed err %d", err); - __nvgpu_vm_free_va(c->vm, ctx->mem.gpu_va, + __nvgpu_vm_free_va(c->vm, ctxheader->gpu_va, GMMU_PAGE_SIZE_KERNEL); - ctx->mem.gpu_va = 0; + ctxheader->gpu_va = 0; } } -- cgit v1.2.2