diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-03-08 08:28:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-03-08 08:28:22 +1000 |
| commit | 9d6245263c16fd9374cc9693054255cbb7bdfd50 (patch) | |
| tree | 9cdd689cf31af822bff13fb964049627051b9b52 /drivers/gpu/drm/radeon/ni.c | |
| parent | 2cc79544bd0aabb4b3cf467ead5df526d9134c64 (diff) | |
| parent | 774c389fae5e5a78a4aa75f927ab59fa0ff8a0d2 (diff) | |
| download | linux-9d6245263c16fd9374cc9693054255cbb7bdfd50.tar.bz2 | |
Merge branch 'drm-fixes-3.9' of git://people.freedesktop.org/~agd5f/linux into drm-next
Alex writes:
Radeon fixes pull. Not much to it.
- fix some splatter if the interrupt handler isn't registered
- Add a quirk for an old R200 board to fix washed out colors on the DAC
- Don't try and soft reset the MC when we reset the GPU. It usually doesn't
need it and doesn't always work reliably.
- A CS checker fix from Marek
* 'drm-fixes-3.9' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: don't check mipmap alignment if MIP_ADDRESS is FMASK
drm/radeon: skip MC reset as it's probably not hung
drm/radeon: add primary dac adj quirk for R200 board
drm/radeon: don't set hpd, afmt interrupts when interrupts are disabled
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 7cead763be9e..d4c633e12863 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -1381,6 +1381,12 @@ static u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev) if (tmp & L2_BUSY) reset_mask |= RADEON_RESET_VMC; + /* Skip MC reset as it's mostly likely not hung, just busy */ + if (reset_mask & RADEON_RESET_MC) { + DRM_DEBUG("MC busy: 0x%08X, clearing.\n", reset_mask); + reset_mask &= ~RADEON_RESET_MC; + } + return reset_mask; } |