git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
evergreen.c
diff --git
a/drivers/gpu/drm/radeon/evergreen.c
b/drivers/gpu/drm/radeon/evergreen.c
index
a8973ac
..
677af91
100644
(file)
--- 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));