diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-11 05:43:16 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-11 05:43:16 +0100 |
| commit | f22d6ddaeb8126623d62c828a4d4a96dfc4cbc5c (patch) | |
| tree | f866bf0e2445144208a9884de89b50ca94c43be2 /drivers/net/tulip/dmfe.c | |
| parent | Merge remote branch 'korg/drm-radeon-next' into drm-linus (diff) | |
| parent | drm/nv04: Fix set_operation software method. (diff) | |
| download | linux-f22d6ddaeb8126623d62c828a4d4a96dfc4cbc5c.tar.xz linux-f22d6ddaeb8126623d62c828a4d4a96dfc4cbc5c.zip | |
Merge branch 'for-airlied' of /ssd/git/drm-nouveau-next into drm-linus
* 'for-airlied' of /ssd/git/drm-nouveau-next: (28 commits)
drm/nv04: Fix set_operation software method.
drm/nouveau: initialise DMA tracking parameters earlier
drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
drm/nv04: differentiate between nv04/nv05
drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence
drm/nv50: prevent a possible ctxprog hang
drm/nouveau: have ttm's fault handler called directly
drm/nv50: restore correct cache1 get/put address on fifoctx load
drm/nouveau: create function for "dealing" with gpu lockup
drm/nouveau: remove unused nouveau_channel_idle() function
drm/nouveau: fix handling of fbcon colours in 8bpp
drm/nv04: Context switching fixes.
drm/nouveau: Use the software object for fencing.
drm/nouveau: Allocate a per-channel instance of NV_SW.
drm/nv50: make the blocksize depend on vram size
drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN
drm/nouveau: Don't skip card take down on nv0x.
drm/nouveau: Implement nv42-nv43 TV load detection.
drm/nouveau: Clean up the nv17-nv4x load detection code a bit.
drm/nv50: fix fillrect color
...
Diffstat (limited to 'drivers/net/tulip/dmfe.c')
0 files changed, 0 insertions, 0 deletions