diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 3f292765aea8..dbcb0752f083 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -1475,8 +1475,10 @@ static void r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 1475 | if (reset_mask & RADEON_RESET_GRBM) | 1475 | if (reset_mask & RADEON_RESET_GRBM) |
| 1476 | srbm_soft_reset |= S_000E60_SOFT_RESET_GRBM(1); | 1476 | srbm_soft_reset |= S_000E60_SOFT_RESET_GRBM(1); |
| 1477 | 1477 | ||
| 1478 | if (reset_mask & RADEON_RESET_MC) | 1478 | if (!(rdev->flags & RADEON_IS_IGP)) { |
| 1479 | srbm_soft_reset |= S_000E60_SOFT_RESET_MC(1); | 1479 | if (reset_mask & RADEON_RESET_MC) |
| 1480 | srbm_soft_reset |= S_000E60_SOFT_RESET_MC(1); | ||
| 1481 | } | ||
| 1480 | 1482 | ||
| 1481 | if (reset_mask & RADEON_RESET_VMC) | 1483 | if (reset_mask & RADEON_RESET_VMC) |
| 1482 | srbm_soft_reset |= S_000E60_SOFT_RESET_VMC(1); | 1484 | srbm_soft_reset |= S_000E60_SOFT_RESET_VMC(1); |