Merge tag 'perf-tools-for-v6.4-3-2023-05-06' of git://git.kernel.org/pub/scm/linux...

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_debugfs.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 0f16d3c093091dc2d7dc2f455a7d48046b1462c6..f60753f97ac598bc04b617ba1e9ab7193cc58b64 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -1717,7 +1717,7 @@ no_preempt:
 
 static int amdgpu_debugfs_ib_preempt(void *data, u64 val)
 {
-       int r, resched, length;
+       int r, length;
        struct amdgpu_ring *ring;
        struct dma_fence **fences = NULL;
        struct amdgpu_device *adev = (struct amdgpu_device *)data;
@@ -1747,8 +1747,6 @@ static int amdgpu_debugfs_ib_preempt(void *data, u64 val)
        /* stop the scheduler */
        kthread_park(ring->sched.thread);
 
-       resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
-
        /* preempt the IB */
        r = amdgpu_ring_preempt_ib(ring);
        if (r) {
@@ -1785,8 +1783,6 @@ failure:
 
        up_read(&adev->reset_domain->sem);
 
-       ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched);
-
 pro_end:
        kfree(fences);