tree 9cdd689cf31af822bff13fb964049627051b9b52
parent 2cc79544bd0aabb4b3cf467ead5df526d9134c64
parent 774c389fae5e5a78a4aa75f927ab59fa0ff8a0d2
author Dave Airlie <airlied@redhat.com> 1362695302 +1000
committer Dave Airlie <airlied@redhat.com> 1362695302 +1000

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