From 13093eff52d0ef9071bb09cade01ea064c99468d Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Mon, 23 Oct 2017 15:52:00 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1586551 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk_domain.c | 2 +- drivers/gpu/nvgpu/clk/clk_fll.c | 2 +- drivers/gpu/nvgpu/clk/clk_freq_controller.c | 2 +- drivers/gpu/nvgpu/clk/clk_prog.c | 2 +- drivers/gpu/nvgpu/clk/clk_vf_point.c | 2 +- drivers/gpu/nvgpu/clk/clk_vin.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/clk') diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 5527351e..dbbf4d4a 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c @@ -149,7 +149,7 @@ u32 clk_domain_sw_setup(struct gk20a *g) gk20a_dbg_info(""); - status = boardobjgrpconstruct_e32(&g->clk_pmu.clk_domainobjs.super); + status = boardobjgrpconstruct_e32(g, &g->clk_pmu.clk_domainobjs.super); if (status) { nvgpu_err(g, "error creating boardobjgrp for clk domain, status - 0x%x", diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index d06cac42..2f05448f 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c @@ -124,7 +124,7 @@ u32 clk_fll_sw_setup(struct gk20a *g) gk20a_dbg_info(""); - status = boardobjgrpconstruct_e32(&g->clk_pmu.avfs_fllobjs.super); + status = boardobjgrpconstruct_e32(g, &g->clk_pmu.avfs_fllobjs.super); if (status) { nvgpu_err(g, "error creating boardobjgrp for fll, status - 0x%x", status); diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index e7859198..f5c1e929 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c @@ -398,7 +398,7 @@ u32 clk_freq_controller_sw_setup(struct gk20a *g) gk20a_dbg_info(""); pclk_freq_controllers = &g->clk_pmu.clk_freq_controllers; - status = boardobjgrpconstruct_e32(&pclk_freq_controllers->super); + status = boardobjgrpconstruct_e32(g, &pclk_freq_controllers->super); if (status) { nvgpu_err(g, "error creating boardobjgrp for clk FCT, status - 0x%x", diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index 6df172aa..6b5315b4 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c @@ -93,7 +93,7 @@ u32 clk_prog_sw_setup(struct gk20a *g) gk20a_dbg_info(""); - status = boardobjgrpconstruct_e255(&g->clk_pmu.clk_progobjs.super); + status = boardobjgrpconstruct_e255(g, &g->clk_pmu.clk_progobjs.super); if (status) { nvgpu_err(g, "error creating boardobjgrp for clk prog, status - 0x%x", diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index c109d9f1..49327698 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c @@ -97,7 +97,7 @@ u32 clk_vf_point_sw_setup(struct gk20a *g) gk20a_dbg_info(""); - status = boardobjgrpconstruct_e255(&g->clk_pmu.clk_vf_pointobjs.super); + status = boardobjgrpconstruct_e255(g, &g->clk_pmu.clk_vf_pointobjs.super); if (status) { nvgpu_err(g, "error creating boardobjgrp for clk vfpoint, status - 0x%x", diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index b529fe72..17e1c15a 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c @@ -257,7 +257,7 @@ u32 clk_vin_sw_setup(struct gk20a *g) gk20a_dbg_info(""); - status = boardobjgrpconstruct_e32(&g->clk_pmu.avfs_vinobjs.super); + status = boardobjgrpconstruct_e32(g, &g->clk_pmu.avfs_vinobjs.super); if (status) { nvgpu_err(g, "error creating boardobjgrp for clk vin, statu - 0x%x", -- cgit v1.2.2