| commit | b1d778b970ce52e02ca6a7f34ba167fe95bc1cc4 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Sun Dec 30 13:02:48 2012 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Sun Dec 30 13:02:48 2012 +1000 |
| tree | c57d08b4807c9a18db7f3a67975854d196533a3c | |
| parent | 344f9067d59a429093fc3e6ed596d1bef2f77c9d [diff] | |
| parent | 668bbc81baf0f34df832d8aca5c7d5e19a493c68 [diff] |
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