diff options
author | Dave Airlie <airlied@redhat.com> | 2012-05-24 09:17:16 (GMT) |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-24 09:55:34 (GMT) |
commit | 8c914028f5ddaa417b7d0f4b7fdc24caceaa8043 (patch) | |
tree | da4be094751a91df13833a50a724eb7774f099ff /drivers/net/wireless/ath/ath5k/mac80211-ops.c | |
parent | 41ceeeb25d5be06660a040e2fc99d6405dfc07f8 (diff) | |
parent | af3289e96383a60f5d3096afeb5579b837aad5e0 (diff) | |
download | linux-8c914028f5ddaa417b7d0f4b7fdc24caceaa8043.tar.xz |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next
Ben was distracted:
"Apologies for being really late with this, feel free to bash me in the
future so I remember on time!
Overview:
- improvements to reclocking (especially memory) on nva3+
- kepler accel support (if you have blob ucode)
- better inter-channel synchronisation on nv84+
- async ttm buffer moves on nv84+ (earlier cards don't have a non-PGRAPH
engine that's useful)"
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (60 commits)
drm/nouveau/nvd9: Fix GPIO initialisation sequence.
drm/nouveau: Unregister switcheroo client on exit
drm/nouveau: Check dsm on switcheroo unregister
drm/nouveau: fix a minor annoyance in an output string
drm/nouveau: turn a BUG into a WARN
drm/nv50: decode PGRAPH DATA_ERROR = 0x24
drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
drm/nvd9/copy: initialise copy engine, seems to work like nvc0
drm/nvc0/ttm: use copy engines for async buffer moves
drm/nva3/ttm: use copy engine for async buffer moves
drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
drm/nv84/ttm: use crypto engine for async buffer copies
drm/nouveau/ttm: untangle code to support accelerated buffer moves
drm/nouveau/fbcon: use fence for sync, rather than notifier
drm/nv98/crypt: non-stub implementation of the engine hooks
drm/nouveau/fifo: turn all fifo modules into engine modules
drm/nv50/graph: remove ability to do interrupt-driven context switching
drm/nv50: remove manual context unload on context destruction
drm/nv50: remove execution engine context saves on suspend
drm/nv50/fifo: use hardware channel kickoff functionality
...
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/mac80211-ops.c')
0 files changed, 0 insertions, 0 deletions