| commit | 0bcb1d844ac638a4c4280f697d5bfac9791e9a70 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Apr 20 13:15:05 2010 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Apr 20 13:15:05 2010 +1000 |
| tree | c51aa8427a81cb64dded4d4f68bf1a1b8ad32041 | |
| parent | c9c2625ff4fc4ce652e686f895059d2902c01ca0 [diff] | |
| parent | 90aca4d2740255bd130ea71a91530b9920c70abe [diff] |
Merge branch 'drm-radeon-lockup' into drm-core-next * drm-radeon-lockup: drm/radeon/kms: simplify & improve GPU reset V2 drm/radeon/kms: rename gpu_reset to asic_reset drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4 Conflicts: drivers/gpu/drm/radeon/r300.c