summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/pmgr
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-07-02 15:30:20 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-07-07 16:44:55 -0400
commitcba424539d39ea184157f80b64938cfa31bc3924 (patch)
treea426a9256295a609bec499fc78244387b9a25ab5 /drivers/gpu/nvgpu/pmgr
parentdfd42c2b2800a9d4c0d99a1694e7040346418aaf (diff)
gpu: nvgpu: Move dev field from gk20a to nvgpu_os_linux
Move field "struct device *dev" from struct gk20a to struct nvgpu_os_linux. The field is valid only for Linux. JIRA NVGPU-38 Change-Id: I09286aa3a9c5a2406e5a27c1fbf21b2c515b4dd4 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master/r/1514162 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/pmgr')
-rw-r--r--drivers/gpu/nvgpu/pmgr/pmgr.c1
-rw-r--r--drivers/gpu/nvgpu/pmgr/pmgrpmu.c1
-rw-r--r--drivers/gpu/nvgpu/pmgr/pwrpolicy.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c
index 1b004832..b1c9ef79 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgr.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgr.c
@@ -18,6 +18,7 @@
18#ifdef CONFIG_DEBUG_FS 18#ifdef CONFIG_DEBUG_FS
19#include <linux/debugfs.h> 19#include <linux/debugfs.h>
20#include "gk20a/platform_gk20a.h" 20#include "gk20a/platform_gk20a.h"
21#include "common/linux/os_linux.h"
21#endif 22#endif
22 23
23int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val) 24int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val)
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
index 803b1bc0..eda296df 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
@@ -18,6 +18,7 @@
18#include "gk20a/gk20a.h" 18#include "gk20a/gk20a.h"
19#include "gk20a/platform_gk20a.h" 19#include "gk20a/platform_gk20a.h"
20#include "gm206/bios_gm206.h" 20#include "gm206/bios_gm206.h"
21#include "common/linux/os_linux.h"
21 22
22#include "boardobj/boardobjgrp.h" 23#include "boardobj/boardobjgrp.h"
23#include "boardobj/boardobjgrp_e32.h" 24#include "boardobj/boardobjgrp_e32.h"
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index 3c3c7a96..970d9953 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -20,6 +20,7 @@
20#include "boardobj/boardobjgrp.h" 20#include "boardobj/boardobjgrp.h"
21#include "boardobj/boardobjgrp_e32.h" 21#include "boardobj/boardobjgrp_e32.h"
22#include "gm206/bios_gm206.h" 22#include "gm206/bios_gm206.h"
23#include "common/linux/os_linux.h"
23 24
24#define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output 25#define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output
25#define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0)) 26#define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0))