diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-08-28 11:39:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-08-28 11:39:11 +1000 |
| commit | 6adae108b2fb0c7b945e297e4a0f0b7d66599656 (patch) | |
| tree | f27fd0ebf1c21fe4690da58d0675ca6117419cf6 /drivers/acpi/tables.c | |
| parent | fb1aacae408a48968840f8743a73edaad94a2f94 (diff) | |
| parent | 3c0363891c0fa5d17b683b758bff0d81fa6a9775 (diff) | |
Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next
More radeon changes for drm-next. Highlights:
- UVD support for older asics
- Reset rework in preparation for Maarten's fence patches
I have a few more patches which depend on Christian's ttm changes,
I'll send them out separately once you've merged the ttm changes.
* 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: drop doing resets in a work item
drm/radeon: drop RADEON_FENCE_SIGNALED_SEQ v2
drm/radeon: add timeout argument to radeon_fence_wait_seq v2
drm/radeon: handle lockup in delayed work, v5
drm/radeon: take exclusive_lock in read mode during ring tests, v5
drm/radeon: force fence completion only on problematic rings (v2)
drm/radeon: wake up all fences on manual reset
drm/radeon: add UVD fw names for older asic
drm/radeon: enable RB_ARB before resetting the VCPU
drm/radeon: 760G/780V/880V don't have UVD
drm/radeon: implement UVD hw workarounds for R6xx v3
drm/radeon: add UVD support for older asics v4
drm/radeon: add set_uvd_clocks callback for r6xx v4
drm/radeon: properly init UVD MC bits on R600
drm/radeon: force UVD buffers into VRAM on RS[78]80 v2
drm/radeon: move the IB test after the AGP fallback
Diffstat (limited to 'drivers/acpi/tables.c')
0 files changed, 0 insertions, 0 deletions