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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1639532
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 4 insertions, 2 deletions

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 <nvgpu/kref.h>
 #include <nvgpu/rwsem.h>
 
+#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);