3 files changed, 16 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
index 29b70b58..8c4e091d 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
@@ -2235,6 +2235,18 @@ static void nvgpu_remove_pmu_support(struct nvgpu_pmu *pmu)
         if (pmu->fw)
                 nvgpu_release_firmware(g, pmu->fw);
 
+        if (g->acr.pmu_fw)
+                nvgpu_release_firmware(g, g->acr.pmu_fw);
+
+        if (g->acr.pmu_desc)
+                nvgpu_release_firmware(g, g->acr.pmu_desc);
+
+        if (g->acr.acr_fw)
+                nvgpu_release_firmware(g, g->acr.acr_fw);
+
+        if (g->acr.hsbl_fw)
+                nvgpu_release_firmware(g, g->acr.hsbl_fw);
+
         nvgpu_mutex_destroy(&pmu->elpg_mutex);
         nvgpu_mutex_destroy(&pmu->pg_mutex);
         nvgpu_mutex_destroy(&pmu->isr_mutex);
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 557948e1..0655b739 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -154,8 +154,10 @@ release_sig:
         nvgpu_release_firmware(g, pmu_sig);
 release_desc:
         nvgpu_release_firmware(g, pmu_desc);
+        g->acr.pmu_desc = NULL;
 release_img_fw:
         nvgpu_release_firmware(g, pmu_fw);
+        g->acr.pmu_fw = NULL;
         return err;
 }
 
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index d17d5751..d7b09220 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -175,8 +175,10 @@ release_sig:
         nvgpu_release_firmware(g, pmu_sig);
 release_desc:
         nvgpu_release_firmware(g, pmu_desc);
+        g->acr.pmu_desc = NULL;
 release_img_fw:
         nvgpu_release_firmware(g, pmu_fw);
+        g->acr.pmu_fw = NULL;
         return err;
 }