Merge branch 'drm-radeon-lockup' into drm-core-next
authorDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 03:15:05 +0000 (13:15 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 20 Apr 2010 03:15:05 +0000 (13:15 +1000)
commit0bcb1d844ac638a4c4280f697d5bfac9791e9a70
treec51aa8427a81cb64dded4d4f68bf1a1b8ad32041
parentc9c2625ff4fc4ce652e686f895059d2902c01ca0
parent90aca4d2740255bd130ea71a91530b9920c70abe
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
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r420.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_fence.c
drivers/gpu/drm/radeon/rs400.c
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rv515.c
drivers/gpu/drm/radeon/rv770.c