Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3493574 authored by Jerome Glisse's avatar Jerome Glisse Committed by Alex Deucher
Browse files

drm/radeon: restore modeset late in GPU reset path 



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: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 5f8f635e

drivers/gpu/drm/radeon/radeon_device.c

+2 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,6 @@ int radeon_gpu_reset(struct radeon_device *rdev) 
	}



	radeon_restore_bios_scratch_regs(rdev);

	drm_helper_resume_force_mode(rdev->ddev);



	if (!r) {

		for (i = 0; i < RADEON_NUM_RINGS; ++i) {
@@ -1373,6 +1372,8 @@ int radeon_gpu_reset(struct radeon_device *rdev) 
		}

	}



	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 ? */