From 3885fe099af0bda910ac8ee64f2cd1a5bbea3ab0 Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Mon, 6 Feb 2017 16:49:24 +0530 Subject: [PATCH] gpu: nvgpu: move pmuif/* to drivers/gpu/nvgpu/include/nvgpu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moved pmuif/* headers to drivers/gpu/nvgpu/include/nvgpu folder to support cross platform feature implementation. Made changes to files which accessed “include pmuif/*” to reflect pmuif/* movement changes. Deleted includes of gk20a.h/pmu_gk20a.h from pmuif/*.h files. Jira NVGPU-19 Change-Id: Iace4e107c24bdaff08a407eae3b147959173e485 Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1299823 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/boardobj/boardobj.c | 4 +--- drivers/gpu/nvgpu/boardobj/boardobj.h | 4 ++-- drivers/gpu/nvgpu/boardobj/boardobjgrp.h | 3 +-- drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 3 +-- drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 3 +-- drivers/gpu/nvgpu/clk/clk.c | 5 ++--- drivers/gpu/nvgpu/clk/clk_domain.c | 4 +--- drivers/gpu/nvgpu/clk/clk_domain.h | 4 ++-- drivers/gpu/nvgpu/clk/clk_fll.c | 4 +--- drivers/gpu/nvgpu/clk/clk_fll.h | 4 ++-- drivers/gpu/nvgpu/clk/clk_freq_controller.c | 4 +--- drivers/gpu/nvgpu/clk/clk_mclk.c | 6 ++---- drivers/gpu/nvgpu/clk/clk_prog.c | 2 -- drivers/gpu/nvgpu/clk/clk_prog.h | 4 ++-- drivers/gpu/nvgpu/clk/clk_vf_point.c | 4 +--- drivers/gpu/nvgpu/clk/clk_vf_point.h | 4 ++-- drivers/gpu/nvgpu/clk/clk_vin.c | 3 +-- drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 2 +- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_acr.h | 0 drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_ap.h | 0 drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_cmn.h | 0 .../gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_perfmon.h | 0 drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_pg.h | 0 .../gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_pg_rppg.h | 2 +- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_pmu.h | 0 drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifbios.h | 2 +- .../gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifboardobj.h | 0 drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifclk.h | 4 ++-- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifperf.h | 2 +- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifperfvfe.h | 2 +- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifpmgr.h | 2 +- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifseq.h | 0 drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuiftherm.h | 0 .../gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifthermsensor.h | 2 +- drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifvolt.h | 2 +- .../gpu/nvgpu/{ => include/nvgpu}/pmuif/nvgpu_gpmu_cmdif.h | 3 +++ drivers/gpu/nvgpu/lpwr/rppg.c | 2 +- drivers/gpu/nvgpu/perf/perf.c | 4 +--- drivers/gpu/nvgpu/perf/perf.h | 3 ++- drivers/gpu/nvgpu/perf/vfe_equ.c | 5 +---- drivers/gpu/nvgpu/perf/vfe_equ.h | 5 ++--- drivers/gpu/nvgpu/perf/vfe_var.c | 3 --- drivers/gpu/nvgpu/perf/vfe_var.h | 5 ++--- drivers/gpu/nvgpu/pmgr/pmgrpmu.c | 5 ++--- drivers/gpu/nvgpu/pmgr/pwrdev.c | 4 +--- drivers/gpu/nvgpu/pmgr/pwrdev.h | 4 ++-- drivers/gpu/nvgpu/pmgr/pwrmonitor.c | 4 +--- drivers/gpu/nvgpu/pmgr/pwrmonitor.h | 4 ++-- drivers/gpu/nvgpu/pmgr/pwrpolicy.c | 2 -- drivers/gpu/nvgpu/pmgr/pwrpolicy.h | 4 ++-- drivers/gpu/nvgpu/therm/thrmchannel.c | 5 ++--- drivers/gpu/nvgpu/therm/thrmdev.c | 5 ++--- drivers/gpu/nvgpu/therm/thrmpmu.c | 5 ++--- drivers/gpu/nvgpu/volt/volt_dev.c | 5 ++--- drivers/gpu/nvgpu/volt/volt_pmu.c | 6 ++---- drivers/gpu/nvgpu/volt/volt_policy.c | 5 ++--- drivers/gpu/nvgpu/volt/volt_rail.c | 5 ++--- 57 files changed, 69 insertions(+), 109 deletions(-) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_acr.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_ap.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_cmn.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_perfmon.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_pg.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_pg_rppg.h (96%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuif_pmu.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifbios.h (94%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifboardobj.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifclk.h (99%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifperf.h (97%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifperfvfe.h (98%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifpmgr.h (99%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifseq.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuiftherm.h (100%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifthermsensor.h (98%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/gpmuifvolt.h (99%) rename drivers/gpu/nvgpu/{ => include/nvgpu}/pmuif/nvgpu_gpmu_cmdif.h (96%) diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index 6cd3e2b16..0fa8f6b6d 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -17,8 +17,6 @@ #include #include "boardobj.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" - u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *args) diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h index 3d437a826..138b3acc9 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/boardobj/boardobj.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -20,7 +20,7 @@ struct boardobj; #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" +#include /* * check whether the specified BOARDOBJ object implements the queried diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h index 303c92888..f41ae48e0 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -23,7 +23,6 @@ struct boardobjgrp; #include "ctrl/ctrlboardobj.h" #include "boardobj.h" #include "boardobjgrpmask.h" -#include "pmuif/gpmuifboardobj.h" /* * Board Object Group destructor. diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c index a56dca9b5..2510f6366 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -15,7 +15,6 @@ #include "boardobj.h" #include "boardobjgrp_e255.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" #include "boardobjgrp.h" #include "boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c index 95610aba0..70b3c8f04 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -16,7 +16,6 @@ #include "boardobjgrp.h" #include "boardobjgrp_e32.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" #include "boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c index ecd53c029..e809b5e95 100644 --- a/drivers/gpu/nvgpu/clk/clk.c +++ b/drivers/gpu/nvgpu/clk/clk.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -13,8 +13,7 @@ #include "gk20a/gk20a.h" #include "clk.h" -#include "pmuif/gpmuifclk.h" -#include "pmuif/gpmuifvolt.h" +#include #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" #include "volt/volt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 892437deb..b53d37086 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -18,8 +18,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifclk.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h index 443e1c4c2..532b7ca58 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.h +++ b/drivers/gpu/nvgpu/clk/clk_domain.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -16,7 +16,7 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifclk.h" +#include #include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index d83f3e155..91cd0e202 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -17,8 +17,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifclk.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h index 06872f48a..89415b4b8 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.h +++ b/drivers/gpu/nvgpu/clk/clk_fll.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -14,7 +14,7 @@ #ifndef _CLKFLL_H_ #define _CLKFLL_H_ -#include "pmuif/gpmuifclk.h" +#include #include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index 17f79168f..6fa2db5a6 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -19,8 +19,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifclk.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c index 0f191b6f3..479fbb0ee 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.c +++ b/drivers/gpu/nvgpu/clk/clk_mclk.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,9 +15,7 @@ #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" - -#include "pmuif/gpmuifseq.h" - +#include #include "gm206/bios_gm206.h" #include "include/bios.h" diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index 4135f767b..38654b664 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c @@ -18,8 +18,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifclk.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h index 541f04cbf..e392870b0 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.h +++ b/drivers/gpu/nvgpu/clk/clk_prog.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -15,7 +15,7 @@ #define _CLKPROG_H_ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifclk.h" +#include #include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrp_e255.h" #include "boardobj/boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 4fde72265..58eeb6c2f 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -17,8 +17,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifclk.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h index 15920066b..8c4fdecd5 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.h +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2017, 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, @@ -15,7 +15,7 @@ #define _CLKVFPOINT_H_ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifclk.h" +#include #include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 1ababe550..133583351 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c @@ -18,8 +18,7 @@ #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifclk.h" +#include #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index 47c2a4b37..e45134571 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h @@ -23,7 +23,7 @@ #include #include -#include "pmuif/nvgpu_gpmu_cmdif.h" +#include /* defined by pmu hw spec */ #define GK20A_PMU_VA_SIZE (512 * 1024 * 1024) diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_acr.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_acr.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuif_acr.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_acr.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_ap.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_ap.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuif_ap.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_ap.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_cmn.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_cmn.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuif_cmn.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_cmn.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_perfmon.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_perfmon.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuif_perfmon.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_perfmon.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_pg.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pg.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuif_pg.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pg.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_pg_rppg.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pg_rppg.h similarity index 96% rename from drivers/gpu/nvgpu/pmuif/gpmuif_pg_rppg.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pg_rppg.h index 7d5c8d41f..d2f23011f 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuif_pg_rppg.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pg_rppg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pmu.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pmu.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifbios.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifbios.h similarity index 94% rename from drivers/gpu/nvgpu/pmuif/gpmuifbios.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifbios.h index 2581d3fa6..eaa44bc22 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifbios.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifbios.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifboardobj.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifboardobj.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h similarity index 99% rename from drivers/gpu/nvgpu/pmuif/gpmuifclk.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h index 5747b0df6..c080197f6 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifclk.h @@ -18,8 +18,8 @@ #include "ctrl/ctrlvolt.h" #include "ctrl/ctrlperf.h" #include "ctrl/ctrlclk.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifvolt.h" +#include "gpmuifboardobj.h" +#include "gpmuifvolt.h" #include enum nv_pmu_clk_clkwhich { diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifperf.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperf.h similarity index 97% rename from drivers/gpu/nvgpu/pmuif/gpmuifperf.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperf.h index 181a65f53..9a9a92bec 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifperf.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifperfvfe.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h similarity index 98% rename from drivers/gpu/nvgpu/pmuif/gpmuifperfvfe.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h index 6bad64456..5f5cafbff 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifperfvfe.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h similarity index 99% rename from drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h index b6842fb77..f956ab76f 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifpmgr.h @@ -15,7 +15,7 @@ #define _GPMUIFPMGR_H_ #include "ctrl/ctrlpmgr.h" -#include "pmuif/gpmuifboardobj.h" +#include "gpmuifboardobj.h" #include struct nv_pmu_pmgr_i2c_device_desc { diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifseq.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifseq.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuifseq.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifseq.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuiftherm.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuiftherm.h similarity index 100% rename from drivers/gpu/nvgpu/pmuif/gpmuiftherm.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuiftherm.h diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h similarity index 98% rename from drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h index bc2b4f526..d240b344d 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifthermsensor.h @@ -15,7 +15,7 @@ #define _GPMUIFTHERMSENSOR_H_ #include "ctrl/ctrltherm.h" -#include "pmuif/gpmuifboardobj.h" +#include "gpmuifboardobj.h" #include #define NV_PMU_THERM_BOARDOBJGRP_CLASS_ID_THERM_DEVICE 0x00 diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h similarity index 99% rename from drivers/gpu/nvgpu/pmuif/gpmuifvolt.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h index b4dea7240..7a18caa6f 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h @@ -13,7 +13,7 @@ #ifndef _GPMUIFVOLT_H_ #define _GPMUIFVOLT_H_ -#include "pmuif/gpmuifboardobj.h" +#include "gpmuifboardobj.h" #include #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h similarity index 96% rename from drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h rename to drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h index 91175c69f..01cd2743e 100644 --- a/drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/nvgpu_gpmu_cmdif.h @@ -23,9 +23,12 @@ #include "gpmuifboardobj.h" #include "gpmuifclk.h" #include "gpmuifperf.h" +#include "gpmuifperfvfe.h" #include "gpmuifpmgr.h" #include "gpmuifvolt.h" #include "gpmuiftherm.h" +#include "gpmuifthermsensor.h" +#include "gpmuifseq.h" struct pmu_cmd { struct pmu_hdr hdr; diff --git a/drivers/gpu/nvgpu/lpwr/rppg.c b/drivers/gpu/nvgpu/lpwr/rppg.c index cde57bf0c..3cc128407 100644 --- a/drivers/gpu/nvgpu/lpwr/rppg.c +++ b/drivers/gpu/nvgpu/lpwr/rppg.c @@ -17,7 +17,7 @@ #include "gm206/bios_gm206.h" #include "pstate/pstate.h" #include "include/bios.h" -#include "pmuif/gpmuif_pg_rppg.h" +#include static void pmu_handle_rppg_init_msg(struct gk20a *g, struct pmu_msg *msg, void *param, u32 handle, u32 status) diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c index 41ebb3158..58efdd6c7 100644 --- a/drivers/gpu/nvgpu/perf/perf.c +++ b/drivers/gpu/nvgpu/perf/perf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -13,8 +13,6 @@ #include "gk20a/gk20a.h" #include "perf.h" -#include "pmuif/gpmuifperf.h" -#include "pmuif/gpmuifperfvfe.h" #include "gk20a/pmu_gk20a.h" #include "clk/clk_arb.h" diff --git a/drivers/gpu/nvgpu/perf/perf.h b/drivers/gpu/nvgpu/perf/perf.h index fe52bad96..ef15d2403 100644 --- a/drivers/gpu/nvgpu/perf/perf.h +++ b/drivers/gpu/nvgpu/perf/perf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -13,6 +13,7 @@ #ifndef _PERF_H_ #define _PERF_H_ +#include #include "vfe_equ.h" #include "vfe_var.h" #include "pstate/pstate.h" diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/perf/vfe_equ.c index 78a7c57c2..3a5b9f459 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/perf/vfe_equ.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -17,9 +17,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e255.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifperf.h" -#include "pmuif/gpmuifperfvfe.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.h b/drivers/gpu/nvgpu/perf/vfe_equ.h index 8aaddccd7..3ca7fb101 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.h +++ b/drivers/gpu/nvgpu/perf/vfe_equ.h @@ -1,7 +1,7 @@ /* * general perf structures & definitions * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -17,8 +17,7 @@ #include "boardobj/boardobjgrp.h" #include "perf/vfe_var.h" -#include "pmuif/gpmuifperf.h" -#include "pmuif/gpmuifperfvfe.h" +#include u32 vfe_equ_sw_setup(struct gk20a *g); u32 vfe_equ_pmu_setup(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c index 35061a1fb..d1e1d76cb 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ b/drivers/gpu/nvgpu/perf/vfe_var.c @@ -17,9 +17,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifperf.h" -#include "pmuif/gpmuifperfvfe.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/perf/vfe_var.h b/drivers/gpu/nvgpu/perf/vfe_var.h index fc43311bd..41db6e221 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.h +++ b/drivers/gpu/nvgpu/perf/vfe_var.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,8 +15,7 @@ #define _VFE_VAR_H_ #include "boardobj/boardobjgrp.h" -#include "pmuif/gpmuifperf.h" -#include "pmuif/gpmuifperfvfe.h" +#include u32 vfe_var_sw_setup(struct gk20a *g); u32 vfe_var_pmu_setup(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index ea070060c..53241734f 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -16,8 +16,7 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifpmgr.h" +#include #include "gm206/bios_gm206.h" #include "gk20a/pmu_gk20a.h" #include "pmgrpmu.h" diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c index da034b31f..e831126bd 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.c +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -16,8 +16,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifpmgr.h" #include "gm206/bios_gm206.h" #include "gk20a/pmu_gk20a.h" diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/pmgr/pwrdev.h index b8592a182..144113e20 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.h +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.h @@ -1,7 +1,7 @@ /* * general power device structures & definitions * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -16,7 +16,7 @@ #define _PWRDEV_H_ #include "boardobj/boardobj.h" -#include "pmuif/gpmuifpmgr.h" +#include #include "ctrl/ctrlpmgr.h" #define PWRDEV_I2CDEV_DEVICE_INDEX_NONE (0xFF) diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c index f14bac073..ab2460eb0 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -16,8 +16,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifpmgr.h" #include "gm206/bios_gm206.h" #include "gk20a/pmu_gk20a.h" diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h index 7cd6b8c9d..9ef5c821c 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h @@ -1,7 +1,7 @@ /* * general power channel structures & definitions * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,9 +15,9 @@ #ifndef _PWRMONITOR_H_ #define _PWRMONITOR_H_ +#include #include "boardobj/boardobjgrp.h" #include "boardobj/boardobj.h" -#include "pmuif/gpmuifpmgr.h" #include "ctrl/ctrlpmgr.h" struct pwr_channel { diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index 2b0be8d81..d19f9a1c9 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c @@ -16,8 +16,6 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifpmgr.h" #include "gm206/bios_gm206.h" #include "gk20a/pmu_gk20a.h" diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h index 008282d35..e14369ea6 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h @@ -1,7 +1,7 @@ /* * general power channel structures & definitions * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,9 +15,9 @@ #ifndef _PWRPOLICY_H_ #define _PWRPOLICY_H_ +#include #include "boardobj/boardobjgrp.h" #include "boardobj/boardobj.h" -#include "pmuif/gpmuifpmgr.h" #include "ctrl/ctrlpmgr.h" #define PWR_POLICY_EXT_POWER_STATE_ID_COUNT 0x4 diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c index aa40dac88..f253a196c 100644 --- a/drivers/gpu/nvgpu/therm/thrmchannel.c +++ b/drivers/gpu/nvgpu/therm/thrmchannel.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -16,8 +16,7 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifthermsensor.h" +#include #include "gm206/bios_gm206.h" #include "gk20a/pmu_gk20a.h" diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c index 9bb77537d..3ff199e72 100644 --- a/drivers/gpu/nvgpu/therm/thrmdev.c +++ b/drivers/gpu/nvgpu/therm/thrmdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -16,8 +16,7 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" -#include "pmuif/gpmuifthermsensor.h" +#include #include "gm206/bios_gm206.h" #include "gk20a/pmu_gk20a.h" #include "ctrl/ctrltherm.h" diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/therm/thrmpmu.c index 0f780730f..a06d3b92b 100644 --- a/drivers/gpu/nvgpu/therm/thrmpmu.c +++ b/drivers/gpu/nvgpu/therm/thrmpmu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,9 +15,8 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" #include "thrmpmu.h" -#include "pmuif/gpmuiftherm.h" +#include struct therm_pmucmdhandler_params { struct nv_pmu_therm_rpc *prpccall; diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index 3a7ed1b53..ebc140eff 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -17,14 +17,13 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlvolt.h" #include "gk20a/pmu_gk20a.h" -#include "pmuif/gpmuifperfvfe.h" #include "include/bios.h" #include "volt.h" +#include #define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 #define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c index 4e7f73c9a..488e67a3f 100644 --- a/drivers/gpu/nvgpu/volt/volt_pmu.c +++ b/drivers/gpu/nvgpu/volt/volt_pmu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,16 +15,14 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlvolt.h" #include "ctrl/ctrlperf.h" #include "gk20a/pmu_gk20a.h" -#include "pmuif/gpmuifperfvfe.h" -#include "pmuif/gpmuifvolt.h" #include "include/bios.h" #include "volt.h" +#include #define RAIL_COUNT 2 diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c index ee3e74b87..e943e771c 100644 --- a/drivers/gpu/nvgpu/volt/volt_policy.c +++ b/drivers/gpu/nvgpu/volt/volt_policy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,12 +15,11 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlvolt.h" #include "gk20a/pmu_gk20a.h" -#include "pmuif/gpmuifperfvfe.h" +#include #include "include/bios.h" #include "volt.h" diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c index 87b85160b..6d6062286 100644 --- a/drivers/gpu/nvgpu/volt/volt_rail.c +++ b/drivers/gpu/nvgpu/volt/volt_rail.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -15,12 +15,11 @@ #include "include/bios.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" -#include "pmuif/gpmuifboardobj.h" #include "gm206/bios_gm206.h" #include "ctrl/ctrlvolt.h" #include "gk20a/pmu_gk20a.h" -#include "pmuif/gpmuifperfvfe.h" +#include #include "include/bios.h" #include "volt.h"