From fbc5296e7d8a7eeceba9a904dd4736373c4c6d4e Mon Sep 17 00:00:00 2001 From: Nitin Kumbhar Date: Mon, 17 Sep 2018 15:18:28 +0530 Subject: gpu: nvgpu: use single lock for gpu power on-off Using two separate locks (poweron_lock and poweroff_lock) allows concurrent gpu power-on and power-off. This shall not happen as driver won't be able to maintain correct gpu state. Use a single power_lock to manage gpu power state. This lock will be used to manage gpu power state from multiple triggers like gpu idle, gpu gc-off, etc. JIRA NVGPU-1100 Change-Id: Ia9b4aeda024a5844ae9f182d453cd6341876680a Signed-off-by: Nitin Kumbhar Reviewed-on: https://git-master.nvidia.com/r/1827812 Reviewed-by: Deepak Nibade Reviewed-by: svc-misra-checker Reviewed-by: Debarshi Dutta Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index 0230709c..1ca6be0d 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -1446,8 +1446,7 @@ struct gk20a { unsigned int ch_wdt_timeout_ms; u32 fifo_eng_timeout_us; - struct nvgpu_mutex poweron_lock; - struct nvgpu_mutex poweroff_lock; + struct nvgpu_mutex power_lock; /* Channel priorities */ u32 timeslice_low_priority_us; -- cgit v1.2.2