commit | a3f5aed42f64878ad98006e27492255381bba061 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Mon Jan 21 13:24:12 2013 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Mon Jan 21 13:24:12 2013 +1000 |
tree | d9dbee246d96b003572eb011609cdf021cc4e0c4 | |
parent | 7b4cf994e4c6ba48872bb25253cc393b7fb74c82 [diff] | |
parent | 20707874fd4fd37e09513f508e642fa8bd06365a [diff] |
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next A number of fixes, and one revert for a patch having some wierd side effects. * 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux: Revert "drm/radeon: do not move bo to different placement at each cs" drm/radeon: improve semaphore debugging on lockup drm/radeon: allow FP16 color clear registers on r500 drm/radeon: clear reset flags if engines are idle