hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
....@@ -3800,8 +3800,10 @@
38003800 return r;
38013801
38023802 r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&ring->mqd_ptr);
3803
- if (unlikely(r != 0))
3803
+ if (unlikely(r != 0)) {
3804
+ amdgpu_bo_unreserve(ring->mqd_obj);
38043805 return r;
3806
+ }
38053807
38063808 gfx_v9_0_kiq_init_queue(ring);
38073809 amdgpu_bo_kunmap(ring->mqd_obj);
....@@ -3943,7 +3945,8 @@
39433945 {
39443946 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
39453947
3946
- amdgpu_irq_put(adev, &adev->gfx.cp_ecc_error_irq, 0);
3948
+ if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX))
3949
+ amdgpu_irq_put(adev, &adev->gfx.cp_ecc_error_irq, 0);
39473950 amdgpu_irq_put(adev, &adev->gfx.priv_reg_irq, 0);
39483951 amdgpu_irq_put(adev, &adev->gfx.priv_inst_irq, 0);
39493952