Commit 5c76c6a8 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: remove nonsense in_interrupt() checks

might_sleep() is supposed to raise if warning if called in interrupt or
atomic context.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEmily Deng <Emily.Deng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 788012e3
...@@ -70,9 +70,7 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) ...@@ -70,9 +70,7 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
if (r < 1 && (adev->in_gpu_reset || in_interrupt())) if (r < 1 && (adev->in_gpu_reset || in_interrupt()))
goto failed_kiq_read; goto failed_kiq_read;
if (in_interrupt()) might_sleep();
might_sleep();
while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) {
msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); msleep(MAX_KIQ_REG_BAILOUT_INTERVAL);
r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT); 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,9 +116,7 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
if (r < 1 && (adev->in_gpu_reset || in_interrupt())) if (r < 1 && (adev->in_gpu_reset || in_interrupt()))
goto failed_kiq_write; goto failed_kiq_write;
if (in_interrupt()) might_sleep();
might_sleep();
while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) { while (r < 1 && cnt++ < MAX_KIQ_REG_TRY) {
msleep(MAX_KIQ_REG_BAILOUT_INTERVAL); msleep(MAX_KIQ_REG_BAILOUT_INTERVAL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment