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
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r600.c
diff --git
a/drivers/gpu/drm/radeon/r600.c
b/drivers/gpu/drm/radeon/r600.c
index
aca2236
..
1e10e3e
100644
(file)
--- a/
drivers/gpu/drm/radeon/r600.c
+++ b/
drivers/gpu/drm/radeon/r600.c
@@
-1287,6
+1287,9
@@
int r600_gpu_soft_reset(struct radeon_device *rdev)
S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1);
u32 tmp;
+ if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE))
+ return 0;
+
dev_info(rdev->dev, "GPU softreset \n");
dev_info(rdev->dev, " R_008010_GRBM_STATUS=0x%08X\n",
RREG32(R_008010_GRBM_STATUS));