Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Albert Pool <albertpool@solcon.nl>
|
|
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>
|
|
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.
|
|
Headers -target for installing the user ABI headers.
|
|
vmwgfx can be broken sometimes, so make sure we do not attempt to build
it by accident.
Add sil164 driver to the build.
|
|
|
|
The master-compat branch is no longer updated.
Use master instead.
|
|
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()
|
|
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>
|
|
|
|
|
|
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Should have no effect currently, the code that uses it depends on the
equivilant PGRAPH function to be available.
|
|
|
|
|
|
|
|
|
|
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.
|
|
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.
|
|
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>
|
|
This reverts commit db3a11a9ca27776ebe1e1b285a9c9123c7f18983.
No longer necessary after latest drm-next pull.
|
|
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 into nouveau
|
|
|
|
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>
|
|
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>
|
|
|
|
|
|
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>
|
|
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
...
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
- 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>
|
|
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>
|
|
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>
|
|
it makes me angry every time I have to do this..
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 into nouveau
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
|
|
Fixes suspend/resume on a lot of pre-G80 chipsets.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|