소스 검색

drm/amdgpu: cleanup fence queue init v2

Move the fence related stuff into amdgpu_fence.c

v2: rework commit message, cause this is actually not a bug

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou<david1.zhou@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Christian König 10 년 전
부모
커밋
5ec92a7692
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 0
      drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
  2. 0 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+ 2 - 0
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

@@ -625,6 +625,8 @@ void amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring)
 			amdgpu_fence_check_lockup);
 	ring->fence_drv.ring = ring;
 
+	init_waitqueue_head(&ring->fence_drv.fence_queue);
+
 	if (amdgpu_enable_scheduler) {
 		ring->sched = amd_sched_create(&amdgpu_sched_ops,
 					       ring->idx,

+ 0 - 2
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

@@ -360,8 +360,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
 		amdgpu_fence_driver_init_ring(ring);
 	}
 
-	init_waitqueue_head(&ring->fence_drv.fence_queue);
-
 	r = amdgpu_wb_get(adev, &ring->rptr_offs);
 	if (r) {
 		dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);