diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 05:15:05 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 05:15:05 +0200 |
| commit | 0bcb1d844ac638a4c4280f697d5bfac9791e9a70 (patch) | |
| tree | c51aa8427a81cb64dded4d4f68bf1a1b8ad32041 /drivers/gpu/drm/nouveau | |
| parent | Merge branch 'drm-edid-fixes' into drm-core-next (diff) | |
| parent | drm/radeon/kms: simplify & improve GPU reset V2 (diff) | |
| download | linux-0bcb1d844ac638a4c4280f697d5bfac9791e9a70.tar.xz linux-0bcb1d844ac638a4c4280f697d5bfac9791e9a70.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/nouveau')
0 files changed, 0 insertions, 0 deletions