6 files changed, 22 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
index e03dbe8d..66c87e08 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c
@@ -44,7 +44,7 @@ struct boardobjgrp_pmucmdhandler_params {
         u32 success;
 };
 
-u32 boardobjgrp_construct_super(struct boardobjgrp *pboardobjgrp)
+u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp)
 {
         gk20a_dbg_info("");
 
@@ -57,6 +57,7 @@ u32 boardobjgrp_construct_super(struct boardobjgrp *pboardobjgrp)
         if (pboardobjgrp->mask == NULL)
                 return -EINVAL;
 
+        pboardobjgrp->g = g;
         pboardobjgrp->objmask = 0;
 
         pboardobjgrp->classid = 0;
@@ -104,6 +105,7 @@ u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp)
 u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp)
 {
         struct boardobj *pboardobj;
+        struct gk20a *g = pboardobjgrp->g;
         u32 status = 0;
         u32 stat;
         u8  index;
@@ -134,11 +136,11 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp)
         }
 
         /* Destroy the PMU CMD data */
-        stat = boardobjgrp_pmucmd_destroy_impl(&pboardobjgrp->pmu.set);
+        stat = boardobjgrp_pmucmd_destroy_impl(g, &pboardobjgrp->pmu.set);
         if (status == 0)
                 status = stat;
 
-        stat = boardobjgrp_pmucmd_destroy_impl(&pboardobjgrp->pmu.getstatus);
+        stat = boardobjgrp_pmucmd_destroy_impl(g, &pboardobjgrp->pmu.getstatus);
         if (status == 0)
                 status = stat;
 
@@ -163,9 +165,12 @@ u32 boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp
         return 0;
 }
 
-
-u32 boardobjgrp_pmucmd_destroy_impl(struct boardobjgrp_pmu_cmd *cmd)
+u32 boardobjgrp_pmucmd_destroy_impl(struct gk20a *g,
+        struct boardobjgrp_pmu_cmd *cmd)
 {
+        struct nvgpu_mem *mem = &cmd->surf.sysmem_desc;
+
+        nvgpu_pmu_surface_free(g, mem);
         return 0;
 }
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
index c7840e02..14d7c1bb 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h
@@ -153,7 +153,8 @@ typedef u32 boardobjgrp_pmucmd_construct(struct gk20a *g,
 /*
 * Destroys BOARDOBJGRP PMU SW state.  CMD.
 */
-typedef u32 boardobjgrp_pmucmd_destroy(struct boardobjgrp_pmu_cmd *cmd);
+typedef u32 boardobjgrp_pmucmd_destroy(struct gk20a *g,
+                struct boardobjgrp_pmu_cmd *cmd);
 
 /*
 * init handler for the BOARDOBJGRP PMU CMD.  Allocates and maps the
@@ -171,6 +172,7 @@ typedef u32 boardobjgrp_pmucmd_pmuinithandle(struct gk20a *g,
 * device group or device-type.
 */
 struct boardobjgrp {
+        struct gk20a *g;
         u32  objmask;
         bool bconstructed;
         u8 type;
@@ -336,7 +338,7 @@ do {                                                                          \
 
 /* ------------------------ Function Prototypes ----------------------------- */
 /* Constructor and destructor */
-u32 boardobjgrp_construct_super(struct boardobjgrp *pboardobjgrp);
+u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp);
 boardobjgrp_destruct boardobjgrp_destruct_impl;
 boardobjgrp_destruct boardobjgrp_destruct_super;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c
index 787f205b..a6223e9a 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c
@@ -27,7 +27,8 @@
 #include "boardobjgrp.h"
 #include "boardobjgrpmask.h"
 
-u32 boardobjgrpconstruct_e255(struct boardobjgrp_e255 *pboardobjgrp_e255)
+u32 boardobjgrpconstruct_e255(struct gk20a *g,
+                              struct boardobjgrp_e255 *pboardobjgrp_e255)
 {
         u32 status = 0;
         u8  objslots;
@@ -44,7 +45,7 @@ u32 boardobjgrpconstruct_e255(struct boardobjgrp_e255 *pboardobjgrp_e255)
         pboardobjgrp_e255->super.objslots  = objslots;
         pboardobjgrp_e255->super.mask     = &(pboardobjgrp_e255->mask.super);
 
-        status = boardobjgrp_construct_super(&pboardobjgrp_e255->super);
+        status = boardobjgrp_construct_super(g, &pboardobjgrp_e255->super);
         if (status)
                 goto boardobjgrpconstruct_e255_exit;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h
index fa33d557..76aa902a 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h
@@ -43,7 +43,7 @@ struct boardobjgrp_e255 {
                 boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu)
 
 /* Constructor and destructor */
-u32 boardobjgrpconstruct_e255(struct boardobjgrp_e255 *pboardobjgrp);
+u32 boardobjgrpconstruct_e255(struct gk20a *g, struct boardobjgrp_e255 *pboardobjgrp);
 boardobjgrp_destruct boardobjgrpdestruct_e255;
 boardobjgrp_pmuhdrdatainit  boardobjgrp_pmuhdrdatainit_e255;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c
index 0a34d563..53380e95 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c
@@ -28,7 +28,8 @@
 #include "boardobjgrpmask.h"
 
 
-u32  boardobjgrpconstruct_e32(struct boardobjgrp_e32 *pboardobjgrp_e32)
+u32  boardobjgrpconstruct_e32(struct gk20a *g,
+                              struct boardobjgrp_e32 *pboardobjgrp_e32)
 {
         u32 status;
         u8  objslots;
@@ -45,7 +46,7 @@ u32  boardobjgrpconstruct_e32(struct boardobjgrp_e32 *pboardobjgrp_e32)
         pboardobjgrp_e32->super.objslots  = objslots;
         pboardobjgrp_e32->super.mask     = &(pboardobjgrp_e32->mask.super);
 
-        status = boardobjgrp_construct_super(&pboardobjgrp_e32->super);
+        status = boardobjgrp_construct_super(g, &pboardobjgrp_e32->super);
         if (status)
                 goto boardobjgrpconstruct_e32_exit;
 
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h
index 674d351a..97c737a5 100644
--- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h
+++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h
@@ -58,7 +58,7 @@ struct boardobjgrp_e32 {
                 boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu)
 
 /* Constructor and destructor */
-u32 boardobjgrpconstruct_e32(struct boardobjgrp_e32 *pboardobjgrp);
+u32 boardobjgrpconstruct_e32(struct gk20a *g, struct boardobjgrp_e32 *pboardobjgrp);
 boardobjgrp_destruct boardobjgrpdestruct_e32;
 boardobjgrp_pmuhdrdatainit  boardobjgrp_pmuhdrdatainit_e32;