From 881961f7c44893e6a7be1b27f375b81766038a79 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 10 Feb 2011 14:46:06 +1000 Subject: [PATCH] --- yaml --- r: 233327 b: refs/heads/master c: 8fd1b84cc9d32e7e5c44e990a9c9e27504b232ed h: refs/heads/master i: 233325: b931c6fdf072d3e97fb0395d30ed552dc722dca9 233323: be8e52e797717e639824617faacc191c367c9b0b 233319: af75856c0c661b7b06ee4881add4f8efd046a08d 233311: 939e60f526bfda7cfc31e261ddfd31d5191fe402 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f2ea48fff4bc..9d3b686277ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f234f5fdca1e31c7a6333c3633edc653cf3e598 +refs/heads/master: 8fd1b84cc9d32e7e5c44e990a9c9e27504b232ed diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c index 0d478932b1a9..4954e2d6ffa2 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_device.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c @@ -936,8 +936,11 @@ int radeon_resume_kms(struct drm_device *dev) int radeon_gpu_reset(struct radeon_device *rdev) { int r; + int resched; radeon_save_bios_scratch_regs(rdev); + /* block TTM */ + resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev); radeon_suspend(rdev); r = radeon_asic_reset(rdev); @@ -946,6 +949,7 @@ int radeon_gpu_reset(struct radeon_device *rdev) radeon_resume(rdev); radeon_restore_bios_scratch_regs(rdev); drm_helper_resume_force_mode(rdev->ddev); + ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched); return 0; } /* bad news, how to tell it to userspace ? */