From 6e3f9112eaf351276b10391f020d203d87314172 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 6 Dec 2017 14:22:52 -0800 Subject: gpu: nvgpu: Disallow use of bare channels All channels need to now be wrapped in TSGs. Disallow use of bare channels by preventing creation of GPFIFO for them. Bug 1842197 Change-Id: Id0ebee4c590804b96c09f8951e35ba2680b596e7 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1612697 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/cde.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common/linux/cde.c') diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index b48c498d..f6b43113 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c @@ -1294,7 +1294,8 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) } /* allocate gpfifo (1024 should be more than enough) */ - err = gk20a_channel_alloc_gpfifo(ch, 1024, 0, 0); + err = gk20a_channel_alloc_gpfifo(ch, 1024, 0, + NVGPU_GPFIFO_FLAGS_ALLOW_BARE_CHANNEL); if (err) { nvgpu_warn(g, "cde: unable to allocate gpfifo"); goto err_alloc_gpfifo; -- cgit v1.2.2