From 147330c2dac6ffaed78100a7ad46907d7e622dca Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Tue, 24 May 2016 14:32:09 +0530 Subject: 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 Reviewed-on: http://git-master/r/1152401 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h') 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; struct gk20a_ctxsw_ucode_segments; struct gk20a_fecs_trace; struct gk20a_ctxsw_trace; -struct acr_gm20b; +struct acr_desc; #include #include @@ -49,6 +49,7 @@ struct acr_gm20b; #include "therm_gk20a.h" #include "platform_gk20a.h" #include "gm20b/acr_gm20b.h" +#include "acr.h" #include "cde_gk20a.h" #include "debug_gk20a.h" @@ -669,7 +670,7 @@ struct gk20a { struct sim_gk20a sim; struct mm_gk20a mm; struct pmu_gk20a pmu; - struct acr_gm20b acr; + struct acr_desc acr; struct cooling_device_gk20a gk20a_cdev; /* Save pmu fw here so that it lives cross suspend/resume. -- cgit v1.2.2