Merge branch 'drm-radeon-linus' of ../drm-next
* 'drm-radeon-linus' of ../drm-next: drm/radeon/kms: retry auxch on 0x20 timeout value. drm/radeon: Skip dma copy test in benchmark if card doesn't have dma engine. drm/radeon/kms: fix screen clearing before fbcon. drm/radeon/kms: add quirk for VGA without DDC on rv730 XFX card. drm/radeon/kms: don't crash if no DDC bus on VGA/DVI connector. drm/radeon/kms: change Kconfig text to reflect the new option. drm/radeon/kms: suspend and resume audio stuff
Showing
- drivers/gpu/drm/radeon/Kconfig 8 additions, 4 deletionsdrivers/gpu/drm/radeon/Kconfig
- drivers/gpu/drm/radeon/atombios_dp.c 7 additions, 3 deletionsdrivers/gpu/drm/radeon/atombios_dp.c
- drivers/gpu/drm/radeon/r600.c 8 additions, 0 deletionsdrivers/gpu/drm/radeon/r600.c
- drivers/gpu/drm/radeon/r600_audio.c 1 addition, 2 deletionsdrivers/gpu/drm/radeon/r600_audio.c
- drivers/gpu/drm/radeon/radeon_atombios.c 9 additions, 0 deletionsdrivers/gpu/drm/radeon/radeon_atombios.c
- drivers/gpu/drm/radeon/radeon_benchmark.c 33 additions, 22 deletionsdrivers/gpu/drm/radeon/radeon_benchmark.c
- drivers/gpu/drm/radeon/radeon_connectors.c 12 additions, 8 deletionsdrivers/gpu/drm/radeon/radeon_connectors.c
- drivers/gpu/drm/radeon/radeon_display.c 10 additions, 1 deletiondrivers/gpu/drm/radeon/radeon_display.c
- drivers/gpu/drm/radeon/radeon_fb.c 1 addition, 1 deletiondrivers/gpu/drm/radeon/radeon_fb.c
Loading
Please register or sign in to comment