|
@@ -1470,20 +1470,26 @@ static int amdgpu_fini(struct amdgpu_device *adev)
|
|
|
amdgpu_wb_fini(adev);
|
|
|
amdgpu_vram_scratch_fini(adev);
|
|
|
}
|
|
|
- /* ungate blocks before hw fini so that we can shutdown the blocks safely */
|
|
|
- r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev,
|
|
|
- AMD_CG_STATE_UNGATE);
|
|
|
- if (r) {
|
|
|
- DRM_ERROR("set_clockgating_state(ungate) of IP block <%s> failed %d\n",
|
|
|
- adev->ip_blocks[i].version->funcs->name, r);
|
|
|
- return r;
|
|
|
+
|
|
|
+ if (adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_UVD &&
|
|
|
+ adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_VCE) {
|
|
|
+ /* ungate blocks before hw fini so that we can shutdown the blocks safely */
|
|
|
+ r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev,
|
|
|
+ AMD_CG_STATE_UNGATE);
|
|
|
+ if (r) {
|
|
|
+ DRM_ERROR("set_clockgating_state(ungate) of IP block <%s> failed %d\n",
|
|
|
+ adev->ip_blocks[i].version->funcs->name, r);
|
|
|
+ return r;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
r = adev->ip_blocks[i].version->funcs->hw_fini((void *)adev);
|
|
|
/* XXX handle errors */
|
|
|
if (r) {
|
|
|
DRM_DEBUG("hw_fini of IP block <%s> failed %d\n",
|
|
|
adev->ip_blocks[i].version->funcs->name, r);
|
|
|
}
|
|
|
+
|
|
|
adev->ip_blocks[i].status.hw = false;
|
|
|
}
|
|
|
|