Merge tag 'amd-drm-next-6.3-2023-01-13' of https://gitlab.freedesktop.org/agd5f/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / radeon_device.c

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 4f9729b4a8119b41e2207ccc221f09ad3f94dee8..afbb3a80c0c6b581ba85bc39027cb9c09094ee65 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1773,7 +1773,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)
        bool saved = false;
 
        int i, r;
-       int resched;
 
        down_write(&rdev->exclusive_lock);
 
@@ -1785,8 +1784,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)
        atomic_inc(&rdev->gpu_reset_counter);
 
        radeon_save_bios_scratch_regs(rdev);
-       /* block TTM */
-       resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev);
        radeon_suspend(rdev);
        radeon_hpd_fini(rdev);
 
@@ -1845,8 +1842,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)
        /* reset hpd state */
        radeon_hpd_init(rdev);
 
-       ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched);
-
        rdev->in_reset = true;
        rdev->needs_reset = false;