diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_fw.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 2 |
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) | |||
2235 | if (pmu->fw) | 2235 | if (pmu->fw) |
2236 | nvgpu_release_firmware(g, pmu->fw); | 2236 | nvgpu_release_firmware(g, pmu->fw); |
2237 | 2237 | ||
2238 | if (g->acr.pmu_fw) | ||
2239 | nvgpu_release_firmware(g, g->acr.pmu_fw); | ||
2240 | |||
2241 | if (g->acr.pmu_desc) | ||
2242 | nvgpu_release_firmware(g, g->acr.pmu_desc); | ||
2243 | |||
2244 | if (g->acr.acr_fw) | ||
2245 | nvgpu_release_firmware(g, g->acr.acr_fw); | ||
2246 | |||
2247 | if (g->acr.hsbl_fw) | ||
2248 | nvgpu_release_firmware(g, g->acr.hsbl_fw); | ||
2249 | |||
2238 | nvgpu_mutex_destroy(&pmu->elpg_mutex); | 2250 | nvgpu_mutex_destroy(&pmu->elpg_mutex); |
2239 | nvgpu_mutex_destroy(&pmu->pg_mutex); | 2251 | nvgpu_mutex_destroy(&pmu->pg_mutex); |
2240 | nvgpu_mutex_destroy(&pmu->isr_mutex); | 2252 | 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: | |||
154 | nvgpu_release_firmware(g, pmu_sig); | 154 | nvgpu_release_firmware(g, pmu_sig); |
155 | release_desc: | 155 | release_desc: |
156 | nvgpu_release_firmware(g, pmu_desc); | 156 | nvgpu_release_firmware(g, pmu_desc); |
157 | g->acr.pmu_desc = NULL; | ||
157 | release_img_fw: | 158 | release_img_fw: |
158 | nvgpu_release_firmware(g, pmu_fw); | 159 | nvgpu_release_firmware(g, pmu_fw); |
160 | g->acr.pmu_fw = NULL; | ||
159 | return err; | 161 | return err; |
160 | } | 162 | } |
161 | 163 | ||
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: | |||
175 | nvgpu_release_firmware(g, pmu_sig); | 175 | nvgpu_release_firmware(g, pmu_sig); |
176 | release_desc: | 176 | release_desc: |
177 | nvgpu_release_firmware(g, pmu_desc); | 177 | nvgpu_release_firmware(g, pmu_desc); |
178 | g->acr.pmu_desc = NULL; | ||
178 | release_img_fw: | 179 | release_img_fw: |
179 | nvgpu_release_firmware(g, pmu_fw); | 180 | nvgpu_release_firmware(g, pmu_fw); |
181 | g->acr.pmu_fw = NULL; | ||
180 | return err; | 182 | return err; |
181 | } | 183 | } |
182 | 184 | ||