diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 01:57:23 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 01:57:32 -0400 |
| commit | 7bfb40b048aa709bb88a00a1acbadbd9f7a645ee (patch) | |
| tree | 88cfef3d3facca564ad378553a838789e0c78cb1 /drivers/gpu/drm/radeon/evergreen.c | |
| parent | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge remote-tracking branch 'origin/master' into next
(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index fb5fa0898868..d8d71a399f52 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -1357,6 +1357,7 @@ int evergreen_cp_resume(struct radeon_device *rdev) | |||
| 1357 | SOFT_RESET_PA | | 1357 | SOFT_RESET_PA | |
| 1358 | SOFT_RESET_SH | | 1358 | SOFT_RESET_SH | |
| 1359 | SOFT_RESET_VGT | | 1359 | SOFT_RESET_VGT | |
| 1360 | SOFT_RESET_SPI | | ||
| 1360 | SOFT_RESET_SX)); | 1361 | SOFT_RESET_SX)); |
| 1361 | RREG32(GRBM_SOFT_RESET); | 1362 | RREG32(GRBM_SOFT_RESET); |
| 1362 | mdelay(15); | 1363 | mdelay(15); |