Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm...
commitb1d778b970ce52e02ca6a7f34ba167fe95bc1cc4
authorDave Airlie <airlied@redhat.com>
Sun, 30 Dec 2012 03:02:48 +0000 (30 13:02 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 30 Dec 2012 03:02:48 +0000 (30 13:02 +1000)
treec57d08b4807c9a18db7f3a67975854d196533a3c
parent344f9067d59a429093fc3e6ed596d1bef2f77c9d
parent668bbc81baf0f34df832d8aca5c7d5e19a493c68
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next

Misc fixes for reset and new packets for userspace usage.

* 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: add WAIT_UNTIL to evergreen VM safe reg list
  drm/radeon: add support for MEM_WRITE packet
  drm/radeon: restore modeset late in GPU reset path
  drm/radeon: avoid deadlock in pm path when waiting for fence
  drm/radeon: don't leave fence blocked process on failed GPU reset