mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	drm/amdgpu: lock the eviction fence for wq signals it
Lock and refer to the eviction fence before the eviction fence schedules work queue tries to signal it. Suggested-by: Christian König <christian.koenig@amd.com> Signed-off-by: Prike Liang <Prike.Liang@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Arvind Yadav <Arvind.Yadav@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
		
							parent
							
								
									eed6a6b226
								
							
						
					
					
						commit
						b2c11e2708
					
				
					 1 changed files with 10 additions and 1 deletions
				
			
		| 
						 | 
					@ -108,13 +108,22 @@ amdgpu_eviction_fence_suspend_worker(struct work_struct *work)
 | 
				
			||||||
	struct amdgpu_eviction_fence *ev_fence;
 | 
						struct amdgpu_eviction_fence *ev_fence;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	mutex_lock(&uq_mgr->userq_mutex);
 | 
						mutex_lock(&uq_mgr->userq_mutex);
 | 
				
			||||||
 | 
						spin_lock(&evf_mgr->ev_fence_lock);
 | 
				
			||||||
	ev_fence = evf_mgr->ev_fence;
 | 
						ev_fence = evf_mgr->ev_fence;
 | 
				
			||||||
	if (!ev_fence)
 | 
						if (ev_fence)
 | 
				
			||||||
 | 
							dma_fence_get(&ev_fence->base);
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
		goto unlock;
 | 
							goto unlock;
 | 
				
			||||||
 | 
						spin_unlock(&evf_mgr->ev_fence_lock);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	amdgpu_userq_evict(uq_mgr, ev_fence);
 | 
						amdgpu_userq_evict(uq_mgr, ev_fence);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						mutex_unlock(&uq_mgr->userq_mutex);
 | 
				
			||||||
 | 
						dma_fence_put(&ev_fence->base);
 | 
				
			||||||
 | 
						return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
unlock:
 | 
					unlock:
 | 
				
			||||||
 | 
						spin_unlock(&evf_mgr->ev_fence_lock);
 | 
				
			||||||
	mutex_unlock(&uq_mgr->userq_mutex);
 | 
						mutex_unlock(&uq_mgr->userq_mutex);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue