Attachment 139562 Details for Bug 106500 – Quick try to avoid deadlock

Quick try to avoid deadlock

test.patch (text/plain), 1.23 KB, created by Andrey Grodzovsky on 2018-05-14 18:31:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Grodzovsky

Created: 2018-05-14 18:31:35 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>index 887f7c9..0a1170e 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>@@ -3196,10 +3196,6 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>        /* block TTM */
>        resched = ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);
> 
>-       /* store modesetting */
>-       if (amdgpu_device_has_dc_support(adev))
>-               state = drm_atomic_helper_suspend(adev->ddev);
>-
>        /* block all schedulers and reset given job's ring */
>        for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>                struct amdgpu_ring *ring = adev->rings[i];
>@@ -3239,12 +3235,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
>                kthread_unpark(ring->sched.thread);
>        }
> 
>-       if (amdgpu_device_has_dc_support(adev)) {
>-               if (drm_atomic_helper_resume(adev->ddev, state))
>-                       dev_info(adev->dev, "drm resume failed:%d\n", r);
>-       } else {
>+       if (!amdgpu_device_has_dc_support(adev))
>                drm_helper_resume_force_mode(adev->ddev);
>-       }
> 
>        ttm_bo_unlock_delayed_workqueue(&adev->mman.bdev, resched);
> 
>

Actions: View

Attachments on bug 106500: 139562 | 139568

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.