summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-19nouveau/Makefile: don't build AST and Cirrus QEMU driversmaster-compatAlbert Pool1-0/+2
Signed-off-by: Albert Pool <albertpool@solcon.nl>
2013-06-16nouveau/makefile: follow upstream changesAlbert Pool1-3/+7
DRM user space headers have moved from include/drm to include/uapi/drm. Disable new DRM drivers mgag200, gma500, and udl. [pq: wrote commit message] Signed-off-by: Pekka Paalanen <pq@iki.fi>
2011-09-25nouveau/Makefile: swap preferred current kernel sources dirsPekka Paalanen1-3/+3
Reported by Vincent Pelletier (vpelletier on IRC) for Debian: /lib/modules/`uname -r`/source does not work as the built kernel tree to compile modules against, but .../build does. Change the preference from .../source to .../build.
2010-10-21nouveau/Makefile: add 'headers' targetPekka Paalanen1-3/+21
Headers -target for installing the user ABI headers.
2010-10-21nouveau/Makefile: build sil164, prevent vmwgfxPekka Paalanen1-1/+3
vmwgfx can be broken sometimes, so make sure we do not attempt to build it by accident. Add sil164 driver to the build.
2009-10-11nouveau/Makefile: add DRM_NOUVEAU_DEBUGPekka Paalanen1-0/+2
2009-10-10BREAK BUILDPekka Paalanen2-0/+4
The master-compat branch is no longer updated. Use master instead.
2009-10-02Merge branch 'master' of ssh://git.freedesktop.org/git/nouveau/linux-2.6 ↵Pekka Paalanen17-220/+246
into master-compat * 'master' of ssh://git.freedesktop.org/git/nouveau/linux-2.6: drm/nv04-nv20: fix return of uninitialized value drm/nouveau: stub bios opcode 0x87 drm/nouveau: disable fbcon accel during irq handler drm/nv10: remove unnecessary stuff from pgraph.destroy_context drm/nouveau: fix missized allocation for ttm_bo_global struct drm/nouveau: remove {pfifo,pgraph}.save_context methods drm/nouveau: use unload_context over save_context for suspend drm/nouveau: remove old channel destruction function drm/nv04: implement {pfifo,pgraph}.unload_context drm/nv10: implement pgraph.unload_context drm/nv20-nv30: implement pgraph.unload_context drm/nv10-nv30: implement pfifo.unload_context drm/nv40: implement {pfifo,pgraph}.unload_context drm/nv50: remove old hacks for context invalidation drm/nouveau: new, cleaner, channel destruction drm/nv50: implement pfifo.unload_context() drm/nv50: implement pgraph.unload_context()
2009-10-01drm/nv04-nv20: fix return of uninitialized valuePekka Paalanen3-6/+5
nvXX_graph_unload_context() triggered the compiler warning: 'ret' is used uninitialized in this function Since nothing is checked in these three functions, just return zero always. Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-10-01drm/nouveau: stub bios opcode 0x87Ben Skeggs1-2/+28
2009-10-01drm/nouveau: disable fbcon accel during irq handlerBen Skeggs1-1/+9
2009-10-01drm/nv10: remove unnecessary stuff from pgraph.destroy_contextBen Skeggs1-30/+0
2009-10-01drm/nouveau: fix missized allocation for ttm_bo_global structMarcin Kościelnicki1-1/+1
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2009-10-01drm/nouveau: remove {pfifo,pgraph}.save_context methodsBen Skeggs11-216/+78
2009-10-01drm/nouveau: use unload_context over save_context for suspendBen Skeggs1-13/+2
2009-10-01drm/nouveau: remove old channel destruction functionBen Skeggs1-100/+2
2009-10-01drm/nv04: implement {pfifo,pgraph}.unload_contextBen Skeggs4-10/+55
2009-10-01drm/nv10: implement pgraph.unload_contextBen Skeggs3-10/+26
2009-10-01drm/nv20-nv30: implement pgraph.unload_contextBen Skeggs3-0/+26
2009-10-01drm/nv10-nv30: implement pfifo.unload_contextBen Skeggs4-3/+34
Should have no effect currently, the code that uses it depends on the equivilant PGRAPH function to be available.
2009-10-01drm/nv40: implement {pfifo,pgraph}.unload_contextBen Skeggs4-11/+51
2009-10-01drm/nv50: remove old hacks for context invalidationBen Skeggs2-11/+0
2009-10-01drm/nouveau: new, cleaner, channel destructionBen Skeggs3-1/+82
2009-10-01drm/nv50: implement pfifo.unload_context()Ben Skeggs3-0/+29
2009-10-01drm/nv50: implement pgraph.unload_context()Ben Skeggs3-9/+22
The semantics of this new hook are slightly different to the existing pgraph.save_context(). The former would save the current state of PGRAPH into "chan", and do nothing further. This call saves the current state of PGRAPH into the channel that's currently active on PGRAPH, and then invalidates the context on PGRAPH.
2009-09-29Merge branch 'master' of ssh://git.freedesktop.org/git/nouveau/linux-2.6 ↵Pekka Paalanen18-443/+585
into master-compat * 'master' of ssh://git.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau: check kmalloc result in nouveau_sgdma_populate Revert "drm/nouveau: more fixes for drm-next" drm/nv10: more gr cleanups drm/r600: fix memory leak introduced with 64k malloc avoidance fix. drm/kms: make fb helper work for all drivers. drm/nv10: clean up gr context switch some more drm/nv04: clean up gr context switch some more drm/nouveau: remove unused typedefs and zero init drm/radeon/r600: fix offset handling in CS parser drm/radeon/kms/r600: fix forcing pci mode on agp cards drm/radeon/kms: fix for the extra pages copying. drm/radeon/kms/r600: add support for vline relocs drm/radeon/kms: fix some bugs in vline reloc drm/radeon/kms/r600: clamp vram to aperture size drm/kms: protect against fb helper not being created.
2009-09-29drm/nouveau: check kmalloc result in nouveau_sgdma_populatePekka Paalanen1-0/+3
Simple grepping revealed one case where the return value of k[zm]alloc() was not checked. Add a check in nouveau_sgdma_populate() in nouveau_sgdma.c. Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-09-29Revert "drm/nouveau: more fixes for drm-next"Ben Skeggs1-7/+0
This reverts commit db3a11a9ca27776ebe1e1b285a9c9123c7f18983. No longer necessary after latest drm-next pull.
2009-09-29Merge branch 'drm-next' of ↵Ben Skeggs12-49/+228
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 into nouveau
2009-09-29drm/nv10: more gr cleanupsBen Skeggs1-365/+337
2009-09-28drm/r600: fix memory leak introduced with 64k malloc avoidance fix.Dave Airlie1-0/+2
The legacy r600 path shares code, but doesn't share quite enough to get the freeing correct. Free the pages here also. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-28drm/kms: make fb helper work for all drivers.Dave Airlie3-26/+43
This initialises the fb helper with the connector helper, so that the fb cmdline code works for intel as well. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-28drm/nv10: clean up gr context switch some moreBen Skeggs1-8/+4
2009-09-28drm/nv04: clean up gr context switch some moreBen Skeggs1-8/+4
2009-09-27drm/nouveau: remove unused typedefs and zero initPekka Paalanen2-6/+9
The types nouveau_subchannel_id_t and nouveau_object_handle_t are never used, so the typedef is removed. Do not explicitly initialize the global nouveau_vbios to NULL. These are all checkpatch.pl fixes. Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-09-26Merge branch 'master' of ssh://git.freedesktop.org/git/nouveau/linux-2.6 ↵Pekka Paalanen144-2567/+5197
into master-compat * 'master' of ssh://git.freedesktop.org/git/nouveau/linux-2.6: (152 commits) drm/nouveau: allow reg 0x4600 from init tables drm/nouveau: more fixes for drm-next drm/nouveau: fix for drm-next changes drm/nouveau: allow user override of vbios source drm/nv04: fix hangs caused by recent changes drm/nouveau: fix suspend where PGRAPH and PFIFO are in different channels drm/nouveau: add hooks to get active channel on PGRAPH drm/nv10: rewrite context switch function drm/nv10: initialise PGRAPH with context invalid drm/nv40: remove some unnecessary per-context setup from PGRAPH init drm/nv04: initialise PFIFO more closely to how NVIDIA do drm/nv10-nv30: remove use of RAMFC_* macros drm/nv10-nv30: initialise PFIFO more like NVIDIA do drm/nouveau: cleanup suspend/resume drm/nv40: ctx_prog -> ctxprog (to match nv50) drm/nv40: make the rest of nv40_fifo.c use nv_[rw]i32 directly drm/nv40: move RAMFC defines to nv40_fifo.c, we won't need them soon anyway.. drm/nv40: modify PFIFO initialisation to be more like what NVIDIA do drm/nouveau: cleanup of nouveau_channel-free drm/nouveau: only disable fbcon accel when we disable the engines ...
2009-09-26drm/radeon/r600: fix offset handling in CS parserAlex Deucher1-5/+5
Need add reloc offset to the offset in the actual packet. Fixes use of the DRAW_INDEX packet by the 3D driver. [airlied: modified first one where idx_value == ib[idx+0] Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
2009-09-26drm/radeon/kms/r600: fix forcing pci mode on agp cardsAlex Deucher1-4/+7
All we need to do on r6xx/r7xx is clear the RADEON_IS_AGP flag; the rest is handled in r600.c fixes fdo bug 23990: http://bugs.freedesktop.org/show_bug.cgi?id=23990 Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
2009-09-26drm/radeon/kms: fix for the extra pages copying.Dave Airlie1-3/+1
Thanks to Michel for pointing this out to me, this is why I need to get more sleep, over complicate this a bit. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-26drm/radeon/kms/r600: add support for vline relocsAlex Deucher3-1/+128
Provides support for anti-tearing functionality in the ddx. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
2009-09-26drm/radeon/kms: fix some bugs in vline relocAlex Deucher1-6/+5
- fix offset of NOP packet for parsing - fix p->idx increments - fix bad mask when updating crtc vline info Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
2009-09-26drm/radeon/kms/r600: clamp vram to aperture sizeAlex Deucher2-0/+14
r6xx and r7xx was missing this. We don't support non-CPU accessible vram yet. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
2009-09-26drm/kms: protect against fb helper not being created.Dave Airlie2-4/+23
If drivers don't init the fb helper on the connector, the cmdline code won't work, but it shouldn't crash either. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-25drm/nouveau: allow reg 0x4600 from init tablesBen Skeggs1-1/+1
it makes me angry every time I have to do this..
2009-09-25drm/nouveau: more fixes for drm-nextBen Skeggs1-0/+7
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2009-09-25drm/nouveau: fix for drm-next changesBen Skeggs3-5/+7
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2009-09-25Merge branch 'drm-next' of ↵Ben Skeggs124-1647/+4206
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 into nouveau
2009-09-25drm/nouveau: allow user override of vbios sourceBen Skeggs3-2/+27
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2009-09-25drm/nv04: fix hangs caused by recent changesBen Skeggs3-56/+51
2009-09-25drm/nouveau: fix suspend where PGRAPH and PFIFO are in different channelsBen Skeggs1-5/+9
Fixes suspend/resume on a lot of pre-G80 chipsets. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>