gpu: nvgpu: add struct nvgpu_sched_ctrl to gk20a

Add struct nvgpu_sched_ctrl to struct gk20a
Delete struct gk20a_sched_ctrl from struct nvgpu_os_linux
Update sched_ctrl functions to use the nvgpu_sched_ctrl struct

Bug 200576520

Change-Id: I35b13219e5ef0a8a03333dfd7d46e1d308aec541
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2279152
Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-by: Satish Arora <satisha@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit

1 files changed, 1 insertions, 20 deletions

diff --git a/drivers/gpu/nvgpu/os/linux/sched.h b/drivers/gpu/nvgpu/os/linux/sched.h
index a699bbea..e88f37f5 100644
--- a/drivers/gpu/nvgpu/os/linux/sched.h
+++ b/drivers/gpu/nvgpu/os/linux/sched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -21,25 +21,6 @@ struct gpu_ops;
 struct tsg_gk20a;
 struct poll_table_struct;
 
-struct gk20a_sched_ctrl {
-        struct gk20a *g;
-
-        struct nvgpu_mutex control_lock;
-        bool control_locked;
-        bool sw_ready;
-        struct nvgpu_mutex status_lock;
-        struct nvgpu_mutex busy_lock;
-
-        u64 status;
-
-        size_t bitmap_size;
-        u64 *active_tsg_bitmap;
-        u64 *recent_tsg_bitmap;
-        u64 *ref_tsg_bitmap;
-
-        struct nvgpu_cond readout_wq;
-};
-
 int gk20a_sched_dev_release(struct inode *inode, struct file *filp);
 int gk20a_sched_dev_open(struct inode *inode, struct file *filp);
 long gk20a_sched_dev_ioctl(struct file *, unsigned int, unsigned long);