diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2012-12-14 16:20:46 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-12-19 17:44:06 -0500 |
| commit | d3493574e267c203836bfdcb9c58d8af46fc0da1 (patch) | |
| tree | 1e884cc95b9189632b3146ffee11c37db953a253 | |
| parent | 5f8f635edd8ad5a6416bff4c5ff486500357f473 (diff) | |
| download | op-kernel-dev-d3493574e267c203836bfdcb9c58d8af46fc0da1.zip op-kernel-dev-d3493574e267c203836bfdcb9c58d8af46fc0da1.tar.gz | |
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: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index a6617b5..cd75626 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1347,7 +1347,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) { @@ -1373,6 +1372,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 ? */ |
