diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index 08963fc83168..72105020086c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | |||
@@ -487,7 +487,6 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) | |||
487 | 487 | ||
488 | if (atomic_dec_and_test(&amdgpu_fence_slab_ref)) | 488 | if (atomic_dec_and_test(&amdgpu_fence_slab_ref)) |
489 | kmem_cache_destroy(amdgpu_fence_slab); | 489 | kmem_cache_destroy(amdgpu_fence_slab); |
490 | mutex_lock(&adev->ring_lock); | ||
491 | for (i = 0; i < AMDGPU_MAX_RINGS; i++) { | 490 | for (i = 0; i < AMDGPU_MAX_RINGS; i++) { |
492 | struct amdgpu_ring *ring = adev->rings[i]; | 491 | struct amdgpu_ring *ring = adev->rings[i]; |
493 | 492 | ||
@@ -505,7 +504,6 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) | |||
505 | del_timer_sync(&ring->fence_drv.fallback_timer); | 504 | del_timer_sync(&ring->fence_drv.fallback_timer); |
506 | ring->fence_drv.initialized = false; | 505 | ring->fence_drv.initialized = false; |
507 | } | 506 | } |
508 | mutex_unlock(&adev->ring_lock); | ||
509 | } | 507 | } |
510 | 508 | ||
511 | /** | 509 | /** |
@@ -520,7 +518,6 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev) | |||
520 | { | 518 | { |
521 | int i, r; | 519 | int i, r; |
522 | 520 | ||
523 | mutex_lock(&adev->ring_lock); | ||
524 | for (i = 0; i < AMDGPU_MAX_RINGS; i++) { | 521 | for (i = 0; i < AMDGPU_MAX_RINGS; i++) { |
525 | struct amdgpu_ring *ring = adev->rings[i]; | 522 | struct amdgpu_ring *ring = adev->rings[i]; |
526 | if (!ring || !ring->fence_drv.initialized) | 523 | if (!ring || !ring->fence_drv.initialized) |
@@ -537,7 +534,6 @@ void amdgpu_fence_driver_suspend(struct amdgpu_device *adev) | |||
537 | amdgpu_irq_put(adev, ring->fence_drv.irq_src, | 534 | amdgpu_irq_put(adev, ring->fence_drv.irq_src, |
538 | ring->fence_drv.irq_type); | 535 | ring->fence_drv.irq_type); |
539 | } | 536 | } |
540 | mutex_unlock(&adev->ring_lock); | ||
541 | } | 537 | } |
542 | 538 | ||
543 | /** | 539 | /** |
@@ -556,7 +552,6 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev) | |||
556 | { | 552 | { |
557 | int i; | 553 | int i; |
558 | 554 | ||
559 | mutex_lock(&adev->ring_lock); | ||
560 | for (i = 0; i < AMDGPU_MAX_RINGS; i++) { | 555 | for (i = 0; i < AMDGPU_MAX_RINGS; i++) { |
561 | struct amdgpu_ring *ring = adev->rings[i]; | 556 | struct amdgpu_ring *ring = adev->rings[i]; |
562 | if (!ring || !ring->fence_drv.initialized) | 557 | if (!ring || !ring->fence_drv.initialized) |
@@ -566,7 +561,6 @@ void amdgpu_fence_driver_resume(struct amdgpu_device *adev) | |||
566 | amdgpu_irq_get(adev, ring->fence_drv.irq_src, | 561 | amdgpu_irq_get(adev, ring->fence_drv.irq_src, |
567 | ring->fence_drv.irq_type); | 562 | ring->fence_drv.irq_type); |
568 | } | 563 | } |
569 | mutex_unlock(&adev->ring_lock); | ||
570 | } | 564 | } |
571 | 565 | ||
572 | /** | 566 | /** |