From af9573b1e34088ac2e16326ac01d699c223591c3 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Thu, 24 Jan 2013 15:00:17 -0500 Subject: [PATCH] --- yaml --- r: 358137 b: refs/heads/master c: 24178ec42b0985d485886bc43b97e54ff173627e h: refs/heads/master i: 358135: d35b87fdd1a9f0741de9a763453990e155c96e11 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 6 ++++-- trunk/drivers/gpu/drm/radeon/ni.c | 6 ++++-- trunk/drivers/gpu/drm/radeon/r600.c | 6 ++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 23448760da7d..69d35fee6ad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 123bc1832c33218dfa677a88c2c54bc1a48a9e72 +refs/heads/master: 24178ec42b0985d485886bc43b97e54ff173627e diff --git a/trunk/drivers/gpu/drm/radeon/evergreen.c b/trunk/drivers/gpu/drm/radeon/evergreen.c index 045955d5f337..2916de896a60 100644 --- a/trunk/drivers/gpu/drm/radeon/evergreen.c +++ b/trunk/drivers/gpu/drm/radeon/evergreen.c @@ -2500,8 +2500,10 @@ static void evergreen_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) if (reset_mask & RADEON_RESET_VMC) srbm_soft_reset |= SOFT_RESET_VMC; - if (reset_mask & RADEON_RESET_MC) - srbm_soft_reset |= SOFT_RESET_MC; + if (!(rdev->flags & RADEON_IS_IGP)) { + if (reset_mask & RADEON_RESET_MC) + srbm_soft_reset |= SOFT_RESET_MC; + } if (grbm_soft_reset) { tmp = RREG32(GRBM_SOFT_RESET); diff --git a/trunk/drivers/gpu/drm/radeon/ni.c b/trunk/drivers/gpu/drm/radeon/ni.c index b6e80550ed90..170bd03d4dd8 100644 --- a/trunk/drivers/gpu/drm/radeon/ni.c +++ b/trunk/drivers/gpu/drm/radeon/ni.c @@ -1474,8 +1474,10 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) if (reset_mask & RADEON_RESET_VMC) srbm_soft_reset |= SOFT_RESET_VMC; - if (reset_mask & RADEON_RESET_MC) - srbm_soft_reset |= SOFT_RESET_MC; + if (!(rdev->flags & RADEON_IS_IGP)) { + if (reset_mask & RADEON_RESET_MC) + srbm_soft_reset |= SOFT_RESET_MC; + } if (grbm_soft_reset) { tmp = RREG32(GRBM_SOFT_RESET); diff --git a/trunk/drivers/gpu/drm/radeon/r600.c b/trunk/drivers/gpu/drm/radeon/r600.c index 3f292765aea8..dbcb0752f083 100644 --- a/trunk/drivers/gpu/drm/radeon/r600.c +++ b/trunk/drivers/gpu/drm/radeon/r600.c @@ -1475,8 +1475,10 @@ static void r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) if (reset_mask & RADEON_RESET_GRBM) srbm_soft_reset |= S_000E60_SOFT_RESET_GRBM(1); - if (reset_mask & RADEON_RESET_MC) - srbm_soft_reset |= S_000E60_SOFT_RESET_MC(1); + if (!(rdev->flags & RADEON_IS_IGP)) { + if (reset_mask & RADEON_RESET_MC) + srbm_soft_reset |= S_000E60_SOFT_RESET_MC(1); + } if (reset_mask & RADEON_RESET_VMC) srbm_soft_reset |= S_000E60_SOFT_RESET_VMC(1);