diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-01-21 15:38:22 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2011-01-24 11:05:25 +1000 |
| commit | 8d96fe9381fa235a81c73c8f940e2fcc84f41caf (patch) | |
| tree | eedf45c7dbee1b27694243d4820ff136a7321af6 /drivers/gpu/drm/radeon/evergreen.c | |
| parent | be23da8ad219650517cbbb7acbeaeb235667113a (diff) | |
| download | kernel_samsung_crespo-8d96fe9381fa235a81c73c8f940e2fcc84f41caf.zip kernel_samsung_crespo-8d96fe9381fa235a81c73c8f940e2fcc84f41caf.tar.gz kernel_samsung_crespo-8d96fe9381fa235a81c73c8f940e2fcc84f41caf.tar.bz2 | |
drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics
Don't reset if the engine isn't busy. This matches the behavior of
previous asics. Reseting a non-hung block can lead to a hang.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=33272
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index a8973ac..677af91 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2201,6 +2201,9 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev) struct evergreen_mc_save save; u32 grbm_reset = 0; + if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) + return 0; + dev_info(rdev->dev, "GPU softreset \n"); dev_info(rdev->dev, " GRBM_STATUS=0x%08X\n", RREG32(GRBM_STATUS)); |