From: Jerome Glisse jglisse@redhat.com

Modeset path seems to conflict sometimes with the memory management leading to kernel deadlock. This move modesetting reset after GPU acceleration reset.

Signed-off-by: Jerome Glisse jglisse@redhat.com --- drivers/gpu/drm/radeon/radeon_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e2f5f88..ffd5534 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1337,7 +1337,6 @@ retry: }

radeon_restore_bios_scratch_regs(rdev); - drm_helper_resume_force_mode(rdev->ddev);

if (!r) { for (i = 0; i < RADEON_NUM_RINGS; ++i) { @@ -1362,6 +1361,8 @@ retry: } }

+ drm_helper_resume_force_mode(rdev->ddev); + ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched); if (r) { /* bad news, how to tell it to userspace ? */