diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-01-24 15:00:17 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-01-31 16:24:58 -0500 |
commit | 24178ec42b0985d485886bc43b97e54ff173627e (patch) | |
tree | 7179ec2f9c917fb36477feb4a12e0d9b53c6e22d /drivers/gpu/drm/radeon/ni.c | |
parent | 123bc1832c33218dfa677a88c2c54bc1a48a9e72 (diff) |
drm/radeon: don't reset the MC on IGPs/APUs
The MC isn't part of the GPU per se.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index b6e80550ed90..170bd03d4dd8 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -1474,8 +1474,10 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
1474 | if (reset_mask & RADEON_RESET_VMC) | 1474 | if (reset_mask & RADEON_RESET_VMC) |
1475 | srbm_soft_reset |= SOFT_RESET_VMC; | 1475 | srbm_soft_reset |= SOFT_RESET_VMC; |
1476 | 1476 | ||
1477 | if (reset_mask & RADEON_RESET_MC) | 1477 | if (!(rdev->flags & RADEON_IS_IGP)) { |
1478 | srbm_soft_reset |= SOFT_RESET_MC; | 1478 | if (reset_mask & RADEON_RESET_MC) |
1479 | srbm_soft_reset |= SOFT_RESET_MC; | ||
1480 | } | ||
1479 | 1481 | ||
1480 | if (grbm_soft_reset) { | 1482 | if (grbm_soft_reset) { |
1481 | tmp = RREG32(GRBM_SOFT_RESET); | 1483 | tmp = RREG32(GRBM_SOFT_RESET); |