From 14fa8207e2f7feb36f8fa284b94859e05136eb0f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 28 Dec 2017 14:08:25 -0800 Subject: gpu: nvgpu: Remove TSG required flag Remove nvgpu internal flag indicating that TSGs are required. We now require TSGs always. This also fixes a regression where CE channels were back to using bare channels on gp106. Bug 1842197 Change-Id: Id359e5a455fb324278636bb8994b583936490ffd Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1628481 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Deepak Nibade GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 99c518b5..5e2fc6b3 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c @@ -456,14 +456,12 @@ u32 gk20a_ce_create_context(struct gk20a *g, ce_ctx->vm = g->mm.ce.vm; - if (nvgpu_is_enabled(g, NVGPU_MM_CE_TSG_REQUIRED)) { - /* allocate a tsg if needed */ - ce_ctx->tsg = gk20a_tsg_open(g); + /* allocate a tsg if needed */ + ce_ctx->tsg = gk20a_tsg_open(g); - if (!ce_ctx->tsg) { - nvgpu_err(g, "ce: gk20a tsg not available"); - goto end; - } + if (!ce_ctx->tsg) { + nvgpu_err(g, "ce: gk20a tsg not available"); + goto end; } /* always kernel client needs privileged channel */ @@ -481,12 +479,10 @@ u32 gk20a_ce_create_context(struct gk20a *g, goto end; } - if (nvgpu_is_enabled(g, NVGPU_MM_CE_TSG_REQUIRED)) { - err = gk20a_tsg_bind_channel(ce_ctx->tsg, ce_ctx->ch); - if (err) { - nvgpu_err(g, "ce: unable to bind to tsg"); - goto end; - } + err = gk20a_tsg_bind_channel(ce_ctx->tsg, ce_ctx->ch); + if (err) { + nvgpu_err(g, "ce: unable to bind to tsg"); + goto end; } /* allocate gpfifo (1024 should be more than enough) */ -- cgit v1.2.2