|
@@ -1455,11 +1455,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
|
|
|
for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
|
|
|
if (!adev->ip_blocks[i].status.hw)
|
|
|
continue;
|
|
|
- if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {
|
|
|
- amdgpu_free_static_csa(adev);
|
|
|
- amdgpu_device_wb_fini(adev);
|
|
|
- amdgpu_device_vram_scratch_fini(adev);
|
|
|
- }
|
|
|
|
|
|
if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
|
|
|
adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE) {
|
|
@@ -1486,6 +1481,13 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
|
|
|
for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
|
|
|
if (!adev->ip_blocks[i].status.sw)
|
|
|
continue;
|
|
|
+
|
|
|
+ if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {
|
|
|
+ amdgpu_free_static_csa(adev);
|
|
|
+ amdgpu_device_wb_fini(adev);
|
|
|
+ amdgpu_device_vram_scratch_fini(adev);
|
|
|
+ }
|
|
|
+
|
|
|
r = adev->ip_blocks[i].version->funcs->sw_fini((void *)adev);
|
|
|
/* XXX handle errors */
|
|
|
if (r) {
|