summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/pmgr
diff options
context:
space:
mode:
authorThomas Fleury <tfleury@nvidia.com>2017-10-23 18:52:00 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-11-06 16:40:59 -0500
commit13093eff52d0ef9071bb09cade01ea064c99468d (patch)
tree3fb71377826a4280fbfdee74957fbae06417bcf9 /drivers/gpu/nvgpu/pmgr
parent8bdce5337ee5f4d1e1f6d4c7b2dc0abe4a532893 (diff)
gpu: nvgpu: add g cross reference in boardobjgrp
Added a pointer to GPU context in boardobjgrp, and updated constructors. It will be useful to free allocated DMA resources. JIRA EVLR-1959 Bug 200352099 Change-Id: I006e4f970c9a2525dabdfd6ad417be64e36b7b68 Signed-off-by: Thomas Fleury <tfleury@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1586551 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/pwrdev.c2
-rw-r--r--drivers/gpu/nvgpu/pmgr/pwrmonitor.c6
-rw-r--r--drivers/gpu/nvgpu/pmgr/pwrpolicy.c12
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c
index 97b236e1..7f4ab716 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c
@@ -291,7 +291,7 @@ u32 pmgr_device_sw_setup(struct gk20a *g)
291 struct pwr_devices *ppwrdeviceobjs; 291 struct pwr_devices *ppwrdeviceobjs;
292 292
293 /* Construct the Super Class and override the Interfaces */ 293 /* Construct the Super Class and override the Interfaces */
294 status = boardobjgrpconstruct_e32(&g->pmgr_pmu.pmgr_deviceobjs.super); 294 status = boardobjgrpconstruct_e32(g, &g->pmgr_pmu.pmgr_deviceobjs.super);
295 if (status) { 295 if (status) {
296 nvgpu_err(g, 296 nvgpu_err(g,
297 "error creating boardobjgrp for pmgr devices, status - 0x%x", 297 "error creating boardobjgrp for pmgr devices, status - 0x%x",
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
index 211766eb..00c930a6 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c
@@ -305,8 +305,8 @@ u32 pmgr_monitor_sw_setup(struct gk20a *g)
305 u8 indx = 0; 305 u8 indx = 0;
306 306
307 /* Construct the Super Class and override the Interfaces */ 307 /* Construct the Super Class and override the Interfaces */
308 status = boardobjgrpconstruct_e32( 308 status = boardobjgrpconstruct_e32(g,
309 &g->pmgr_pmu.pmgr_monitorobjs.pwr_channels); 309 &g->pmgr_pmu.pmgr_monitorobjs.pwr_channels);
310 if (status) { 310 if (status) {
311 nvgpu_err(g, 311 nvgpu_err(g,
312 "error creating boardobjgrp for pmgr channel, status - 0x%x", 312 "error creating boardobjgrp for pmgr channel, status - 0x%x",
@@ -320,7 +320,7 @@ u32 pmgr_monitor_sw_setup(struct gk20a *g)
320 pboardobjgrp->pmudatainstget = _pwr_channel_pmudata_instget; 320 pboardobjgrp->pmudatainstget = _pwr_channel_pmudata_instget;
321 321
322 /* Construct the Super Class and override the Interfaces */ 322 /* Construct the Super Class and override the Interfaces */
323 status = boardobjgrpconstruct_e32( 323 status = boardobjgrpconstruct_e32(g,
324 &g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels); 324 &g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels);
325 if (status) { 325 if (status) {
326 nvgpu_err(g, 326 nvgpu_err(g,
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index 5eade2e0..420eda4f 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -718,8 +718,8 @@ u32 pmgr_policy_sw_setup(struct gk20a *g)
718 u8 indx = 0; 718 u8 indx = 0;
719 719
720 /* Construct the Super Class and override the Interfaces */ 720 /* Construct the Super Class and override the Interfaces */
721 status = boardobjgrpconstruct_e32( 721 status = boardobjgrpconstruct_e32(g,
722 &g->pmgr_pmu.pmgr_policyobjs.pwr_policies); 722 &g->pmgr_pmu.pmgr_policyobjs.pwr_policies);
723 if (status) { 723 if (status) {
724 nvgpu_err(g, 724 nvgpu_err(g,
725 "error creating boardobjgrp for pmgr policy, status - 0x%x", 725 "error creating boardobjgrp for pmgr policy, status - 0x%x",
@@ -727,8 +727,8 @@ u32 pmgr_policy_sw_setup(struct gk20a *g)
727 goto done; 727 goto done;
728 } 728 }
729 729
730 status = boardobjgrpconstruct_e32( 730 status = boardobjgrpconstruct_e32(g,
731 &g->pmgr_pmu.pmgr_policyobjs.pwr_policy_rels); 731 &g->pmgr_pmu.pmgr_policyobjs.pwr_policy_rels);
732 if (status) { 732 if (status) {
733 nvgpu_err(g, 733 nvgpu_err(g,
734 "error creating boardobjgrp for pmgr policy rels, status - 0x%x", 734 "error creating boardobjgrp for pmgr policy rels, status - 0x%x",
@@ -736,8 +736,8 @@ u32 pmgr_policy_sw_setup(struct gk20a *g)
736 goto done; 736 goto done;
737 } 737 }
738 738
739 status = boardobjgrpconstruct_e32( 739 status = boardobjgrpconstruct_e32(g,
740 &g->pmgr_pmu.pmgr_policyobjs.pwr_violations); 740 &g->pmgr_pmu.pmgr_policyobjs.pwr_violations);
741 if (status) { 741 if (status) {
742 nvgpu_err(g, 742 nvgpu_err(g,
743 "error creating boardobjgrp for pmgr violations, status - 0x%x", 743 "error creating boardobjgrp for pmgr violations, status - 0x%x",