summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2012-05-24Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds323-14777/+41792
2012-05-24Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds189-5539/+6665
2012-05-24Merge branch 'perf-uprobes-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds30-979/+5048
2012-05-24Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds106-1305/+2845
2012-05-24Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds463-16754/+39172
2012-05-24Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/...Dave Airlie76-3026/+9520
2012-05-24Merge branch 'next' into for-linusDmitry Torokhov10821-299049/+511649
2012-05-24Input: matrix-keymap - fix building keymapsDmitry Torokhov1-1/+1
2012-05-24drm/nouveau/nvd9: Fix GPIO initialisation sequence.Marcin Koƛcielnicki1-1/+1
2012-05-24drm/nouveau: Unregister switcheroo client on exitAndreas Heider1-0/+2
2012-05-24drm/nouveau: Check dsm on switcheroo unregisterAndreas Heider1-1/+2
2012-05-24drm/nouveau: fix a minor annoyance in an output stringBen Skeggs1-1/+1
2012-05-24drm/nouveau: turn a BUG into a WARNBen Skeggs1-1/+1
2012-05-24drm/nv50: decode PGRAPH DATA_ERROR = 0x24Marcin Slusarz1-0/+1
2012-05-24drm/nouveau/disp: fix dithering not being enabled on some eDP macbooksBen Skeggs1-1/+7
2012-05-24drm/nvd9/copy: initialise copy engine, seems to work like nvc0Ben Skeggs1-1/+2
2012-05-24drm/nvc0/ttm: use copy engines for async buffer movesBen Skeggs1-9/+51
2012-05-24drm/nva3/ttm: use copy engine for async buffer movesBen Skeggs1-1/+40
2012-05-24drm/nv98/ttm: add in a (disabled) crypto engine buffer copy methodBen Skeggs1-1/+20
2012-05-24drm/nv84/ttm: use crypto engine for async buffer copiesBen Skeggs1-0/+19
2012-05-24drm/nouveau/ttm: untangle code to support accelerated buffer movesBen Skeggs8-94/+119
2012-05-24drm/nouveau/fbcon: use fence for sync, rather than notifierBen Skeggs1-32/+2
2012-05-24drm/nv98/crypt: non-stub implementation of the engine hooksBen Skeggs3-14/+1434
2012-05-24drm/nouveau/fifo: turn all fifo modules into engine modulesBen Skeggs30-1386/+1374
2012-05-24drm/nv50/graph: remove ability to do interrupt-driven context switchingBen Skeggs1-65/+0
2012-05-24drm/nv50: remove manual context unload on context destructionBen Skeggs3-94/+7
2012-05-24drm/nv50: remove execution engine context saves on suspendBen Skeggs3-14/+0
2012-05-24drm/nv50/fifo: use hardware channel kickoff functionalityBen Skeggs3-166/+43
2012-05-24drm/nv50/gr: make sure NEXT_TO_CURRENT is executed even if nothing doneBen Skeggs1-1/+1
2012-05-24drm/nv50/fifo: construct playlist from hw context table stateBen Skeggs1-14/+7
2012-05-24drm/nouveau/fifo: remove all the "special" engine hooksBen Skeggs13-187/+62
2012-05-24drm/nouveau/fence: fix a race where fence->channel can disappearBen Skeggs6-15/+26
2012-05-24drm/nouveau/bios: fix some shadowing issues, particularly acpiBen Skeggs1-20/+10
2012-05-24drm/nouveau: fix engine context destructor orderingBen Skeggs1-2/+1
2012-05-24drm/nouveau/fence: convert to exec engine, and improve channel syncBen Skeggs14-473/+851
2012-05-24drm/nouveau/fence: minor api changes for an upcoming reworkBen Skeggs8-158/+134
2012-05-24drm/nouveau/fence: make ttm interfaces wrap ours, not the other way aroundBen Skeggs3-71/+68
2012-05-24drm/nouveau: move flip-related channel setup to software engineBen Skeggs8-62/+84
2012-05-24drm/nouveau: create real execution engine for software object classBen Skeggs19-282/+567
2012-05-24drm/nvd0/disp: remove unnecessary sync from flip_nextBen Skeggs1-2/+0
2012-05-24drm/nv04/disp: disable vblank interrupts when disabling displayBen Skeggs2-5/+11
2012-05-24drm/nouveau: base fence timeout on time of emissionMarcin Slusarz1-1/+4
2012-05-24drm/nv40-50/gr: restructure grctx/prog generationBen Skeggs6-52/+71
2012-05-24drm/nv50/disp: fixup error paths in crtc object creationBen Skeggs2-33/+26
2012-05-24drm/nouveau: cleanup after display init failureMarcin Slusarz1-2/+9
2012-05-24drm/nv50: fix ramin heap size for kernel channel tooMarcin Slusarz1-1/+1
2012-05-24drm/nve0/graph: bump hub2gpc buffer sizeBen Skeggs1-1/+1
2012-05-24drm/nouveau: use the same packet header macros as userspaceBen Skeggs15-185/+203
2012-05-24drm/nouveau/bios: allow loading alternate vbios image as firmwareBen Skeggs1-0/+21
2012-05-24drm/nve0/ttm: implement buffer moves with weirdo pcopy-on-pgraph methodsBen Skeggs3-0/+39