From 2f6698b863c9cc1db6455637b7c72e812b470b93 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 15 Dec 2017 09:04:15 -0800 Subject: gpu: nvgpu: Make graphics context property of TSG Move graphics context ownership to TSG instead of channel. Combine channel_ctx_gk20a and gr_ctx_desc to one structure, because the split between them was arbitrary. Move context header to be property of channel. Bug 1842197 Change-Id: I410e3262f80b318d8528bcbec270b63a2d8d2ff9 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1639532 Reviewed-by: Seshendra Gadagottu Tested-by: Seshendra Gadagottu Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/tsg_gk20a.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/tsg_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h index 08fe0365..2168cb4f 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.h @@ -26,6 +26,8 @@ #include #include +#include "gr_gk20a.h" + #ifdef CONFIG_TEGRA_19x_GPU #include "tsg_t19x.h" #endif @@ -56,8 +58,6 @@ struct tsg_gk20a { unsigned int timeslice_timeout; unsigned int timeslice_scale; - struct gr_ctx_desc *tsg_gr_ctx; - struct vm_gk20a *vm; u32 interleave_level; @@ -71,6 +71,8 @@ struct tsg_gk20a { #ifdef CONFIG_TEGRA_19x_GPU struct tsg_t19x t19x; #endif + + struct nvgpu_gr_ctx gr_ctx; }; int gk20a_enable_tsg(struct tsg_gk20a *tsg); -- cgit v1.2.2