diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2016-05-24 05:02:09 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-26 19:06:30 -0400 |
commit | 147330c2dac6ffaed78100a7ad46907d7e622dca (patch) | |
tree | cf65b851286f9dc240c17f941957ab49d1022167 /drivers/gpu/nvgpu/gk20a | |
parent | e9d5e7dfca6ac2fa7af380ceea0a0ca4ac3827c6 (diff) |
gpu: nvgpu: move & rename acr_gm20b to acr_desc
acr_gm20b renamed to acr_desc to support
multiple gpu chips
JIRA DNVGPU-10
Change-Id: Ib3b38d5845043f026ddc365a682b7bb454463326
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1152401
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index d96ce3d8..56f8fddb 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -26,7 +26,7 @@ struct sim_gk20a; | |||
26 | struct gk20a_ctxsw_ucode_segments; | 26 | struct gk20a_ctxsw_ucode_segments; |
27 | struct gk20a_fecs_trace; | 27 | struct gk20a_fecs_trace; |
28 | struct gk20a_ctxsw_trace; | 28 | struct gk20a_ctxsw_trace; |
29 | struct acr_gm20b; | 29 | struct acr_desc; |
30 | 30 | ||
31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
32 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
@@ -49,6 +49,7 @@ struct acr_gm20b; | |||
49 | #include "therm_gk20a.h" | 49 | #include "therm_gk20a.h" |
50 | #include "platform_gk20a.h" | 50 | #include "platform_gk20a.h" |
51 | #include "gm20b/acr_gm20b.h" | 51 | #include "gm20b/acr_gm20b.h" |
52 | #include "acr.h" | ||
52 | #include "cde_gk20a.h" | 53 | #include "cde_gk20a.h" |
53 | #include "debug_gk20a.h" | 54 | #include "debug_gk20a.h" |
54 | 55 | ||
@@ -669,7 +670,7 @@ struct gk20a { | |||
669 | struct sim_gk20a sim; | 670 | struct sim_gk20a sim; |
670 | struct mm_gk20a mm; | 671 | struct mm_gk20a mm; |
671 | struct pmu_gk20a pmu; | 672 | struct pmu_gk20a pmu; |
672 | struct acr_gm20b acr; | 673 | struct acr_desc acr; |
673 | struct cooling_device_gk20a gk20a_cdev; | 674 | struct cooling_device_gk20a gk20a_cdev; |
674 | 675 | ||
675 | /* Save pmu fw here so that it lives cross suspend/resume. | 676 | /* Save pmu fw here so that it lives cross suspend/resume. |