drm/amdgpu: screen freeze and userq driver crash

Screen freeze and userq fence driver crash while playing Xonotic

v2: (Christian)
    - There is change that fence might signal in between testing
      and grabbing the lock. Hence we can move the lock above the
      if..else check and use the dma_fence_is_signaled_locked().

Signed-off-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
index f7baea2c67abec7f7522c08c0f390becf27b0da0..3693453d8b601c7ba9fd31ea22d7974ec9d06ac2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c
@@ -171,6 +171,7 @@ int amdgpu_userq_fence_create(struct amdgpu_usermode_queue *userq,
        struct amdgpu_userq_fence_driver *fence_drv;
        struct amdgpu_userq_fence *userq_fence;
        struct dma_fence *fence;
+       unsigned long flags;
 
        fence_drv = userq->fence_drv;
        if (!fence_drv)
@@ -191,14 +192,14 @@ int amdgpu_userq_fence_create(struct amdgpu_usermode_queue *userq,
        amdgpu_userq_fence_driver_get(fence_drv);
        dma_fence_get(fence);
 
-       spin_lock(&fence_drv->fence_list_lock);
        /* Check if hardware has already processed the job */
-       if (!dma_fence_is_signaled(fence))
+       spin_lock_irqsave(&fence_drv->fence_list_lock, flags);
+       if (!dma_fence_is_signaled_locked(fence))
                list_add_tail(&userq_fence->link, &fence_drv->fences);
        else
                dma_fence_put(fence);
 
-       spin_unlock(&fence_drv->fence_list_lock);
+       spin_unlock_irqrestore(&fence_drv->fence_list_lock, flags);
 
        *f = fence;