[src/trunk]: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu Remove local amdgp...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a74acc58a2f
branches:  trunk
changeset: 1028273:9a74acc58a2f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:59:30 2021 +0000

description:
Remove local amdgpu fence locking changes that are no longer needed.

But keep destroying spin locks and timers.

diffstat:

 sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c |  30 ++-------------
 1 files changed, 4 insertions(+), 26 deletions(-)

diffs (58 lines):

diff -r 345964668897 -r 9a74acc58a2f sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
--- a/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c  Sun Dec 19 09:59:22 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c  Sun Dec 19 09:59:30 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_fence.c,v 1.7 2021/12/18 23:44:58 riastradh Exp $       */
+/*     $NetBSD: amdgpu_fence.c,v 1.8 2021/12/19 09:59:30 riastradh Exp $       */
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -31,7 +31,7 @@
  *    Dave Airlie
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.7 2021/12/18 23:44:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.8 2021/12/19 09:59:30 riastradh Exp $");
 
 #include <linux/seq_file.h>
 #include <linux/atomic.h>
@@ -290,25 +290,6 @@
        return true;
 }
 
-#ifdef __NetBSD__
-static int amdgpu_fence_check_signaled(struct amdgpu_fence *);
-
-static void
-amdgpu_fence_wakeup_locked(struct amdgpu_ring *ring)
-{
-       struct amdgpu_fence *fence, *next;
-
-       BUG_ON(!spin_is_locked(&ring->fence_drv.fence_lock));
-       DRM_SPIN_WAKEUP_ALL(&ring->fence_drv.fence_queue,
-           &ring->fence_drv.fence_lock);
-       TAILQ_FOREACH_SAFE(fence, &ring->fence_drv.fence_check, fence_check,
-           next) {
-               amdgpu_fence_check_signaled(fence);
-       }
-}
-#endif
-
-
 /**
  * amdgpu_fence_fallback - fallback for hardware interrupts
  *
@@ -567,11 +548,8 @@
                kfree(ring->fence_drv.fences);
                ring->fence_drv.fences = NULL;
                ring->fence_drv.initialized = false;
-#ifdef __NetBSD__
-               BUG_ON(!TAILQ_EMPTY(&ring->fence_drv.fence_check));
-               DRM_DESTROY_WAITQUEUE(&ring->fence_drv.fence_queue);
-               spin_lock_destroy(&ring->fence_drv.fence_lock);
-#endif
+               spin_lock_destroy(&ring->fence_drv.lock);
+               timer_teardown(&ring->fence_drv.fallback_timer);
        }
 }