diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index cca794a1f8ba..ff887639bfa3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |||
@@ -70,9 +70,7 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) | |||
70 | if (r < 1 && (adev->in_gpu_reset || in_interrupt())) | 70 | if (r < 1 && (adev->in_gpu_reset || in_interrupt())) |
71 | goto failed_kiq_read; | 71 | goto failed_kiq_read; |
72 | 72 | ||
73 | if (in_interrupt()) | 73 | might_sleep(); |
74 | might_sleep(); | ||
75 | |||
76 | while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { | 74 | while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { |
77 | msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); | 75 | msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); |
78 | r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT); | 76 | r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT); |
@@ -118,9 +116,7 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v) | |||
118 | if (r < 1 && (adev->in_gpu_reset || in_interrupt())) | 116 | if (r < 1 && (adev->in_gpu_reset || in_interrupt())) |
119 | goto failed_kiq_write; | 117 | goto failed_kiq_write; |
120 | 118 | ||
121 | if (in_interrupt()) | 119 | might_sleep(); |
122 | might_sleep(); | ||
123 | |||
124 | while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { | 120 | while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { |
125 | 121 | ||
126 | msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); | 122 | msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); |