From 9e9046f03cf3125067666dc652499a4b7f39d9c0 Mon Sep 17 00:00:00 2001 From: Peter Daifuku Date: Tue, 14 Jan 2020 11:14:38 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2279152 Reviewed-by: Thomas Fleury Reviewed-by: Satish Arora Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/os/linux/sched.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'drivers/gpu/nvgpu/os/linux/sched.h') 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); -- cgit v1.2.2