Kristian Høgsberg
68cdcda1ea
Add new shared header file drm_internal.h.
...
This header file is shared across linux and bsd, but is not installed
for user space to access. It's the place to put prototypes and data
types that aren't platform or chipset specific, but still internal to
the drm.
2007-11-14 14:28:34 -05:00
Stephane Marchesin
448ccf13ba
nouveau: adjust the size of the NV34 context. That fixes mobile PPC cards.
2007-11-14 02:59:00 +01:00
Thomas Hellstrom
f3708b4c04
Fix ttmtest.
2007-11-13 15:47:20 +01:00
Ben Skeggs
2d7eb4434f
nouveau: Also wait until CACHE1 gets emptied.
2007-11-14 05:36:20 +11:00
Ben Skeggs
7e4bb6099a
Revert "nouveau: stub superioctl"
...
This reverts commit 2370ded79b
.
Err.. didn't mean for that to slip in :)
2007-11-14 05:11:11 +11:00
Ben Skeggs
eb5487b9ca
Merge branch 'fifo-cleanup' into upstream-master
2007-11-14 05:09:07 +11:00
Ben Skeggs
7c1e59fb0c
nouveau: Attempt to wait for channel idle before we destroy it.
2007-11-14 04:26:49 +11:00
Ben Skeggs
53ab6026cf
nouveau: Use "new" NV40 USER control regs.
...
Probably entirely pointless, but a simple change in any case.
2007-11-14 04:15:13 +11:00
Ben Skeggs
7246a33dd1
nouveau: store user control reg offsets in channel struct
2007-11-14 04:09:53 +11:00
Ben Skeggs
d0904f0f2b
nouveau: funcs to determine active channel on PFIFO.
2007-11-14 03:27:37 +11:00
Ben Skeggs
2370ded79b
nouveau: stub superioctl
2007-11-14 03:00:25 +11:00
Jesse Barnes
793cd1dad5
Make sure PLLs are enabled before writing pipe configuration regs
...
Fix from the X driver. Make sure the PLLs are enabled and not in VGA mode
before writing PIPE(A|B)CONF regs to avoid hangs or crashes.
2007-11-10 14:39:36 -08:00
Patrice Mandin
c2f80ecf4b
suspend() and resume() need kernel 2.6.22 or later
2007-11-09 18:08:08 +01:00
Jerome Glisse
e1bc147ac9
drm: check edid data, so we deal well with broken driver.
2007-11-09 17:28:56 +01:00
Jerome Glisse
ffb89d4c3b
drm: split edid handling in get_edid & add_edid_mode
...
This way driver can get_edid in output status detection
(using all workaround which are in get_edid) and then provide
this edid data in get_mode callback of output.
2007-11-09 15:47:24 +01:00
Dave Airlie
d983ed90cb
i915: cleanup pageflip derefs sarea even if no sarea exists
2007-11-09 11:30:50 +10:00
Thomas Hellstrom
e9805de5c7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
shared-core/i915_dma.c
2007-11-07 18:10:46 +01:00
Thomas Hellstrom
c20370e096
Don't overwrite TTM page flags.
2007-11-07 18:07:56 +01:00
Dave Airlie
47497abc1e
i915: oops disable TTM is backwards
2007-11-07 23:10:24 +10:00
Thomas Hellstrom
c07dd80269
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
...
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2007-11-06 10:01:52 +01:00
Thomas Hellstrom
40fb079aeb
Avoid buffers not ending up on a list in some cases.
2007-11-06 09:47:57 +01:00
Thomas Hellstrom
20eecf2b88
Add missing drm_regman.c file.
2007-11-06 09:36:29 +01:00
Dave Airlie
9280076b67
i915: disable TTM on 8xx chips for now until flushing is solved
2007-11-06 18:13:46 +11:00
Dave Airlie
349eebd567
i915: compat code doesn't work in i8xx hw.
2007-11-06 18:00:10 +11:00
Zhenyu Wang
81b7f9b71c
[PATCH] i915: fix missing G33 detect in IS_I9XX
...
G33 detect seems missing with Jesse's suspend/resume patch.
2007-11-06 17:59:14 +11:00
Dave Airlie
b437c8ca0f
drm/agp: kernel style fixes
2007-11-06 12:16:07 +10:00
Dave Airlie
9493ce6ca3
i915: cleanup most of the whitespace
2007-11-06 12:16:07 +10:00
Thomas Hellstrom
5ce43a346c
Merge branch 'master' into modesetting-101
...
Conflicts:
linux-core/drm_bufs.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2007-11-05 13:46:06 +01:00
Thomas Hellstrom
427cc561b3
Export a symbol.
2007-11-05 13:22:00 +01:00
Thomas Hellstrom
44ad6f409d
Fix a user-buffer check.
2007-11-05 13:20:16 +01:00
Alan Hourihane
1b91113957
remove unused define
2007-11-05 10:06:37 +00:00
Alan Hourihane
306bb12603
remove duplicate and obsolete ioctl statements
2007-11-05 10:05:01 +00:00
Alan Hourihane
71385d6f75
add missing lock
2007-11-05 10:03:26 +00:00
Alan Hourihane
d0956339e3
Use _size
2007-11-05 10:02:46 +00:00
Alan Hourihane
0bee83a8c8
Pass pointer to drmModeRmMode.
2007-11-05 10:00:43 +00:00
Alan Hourihane
5e86f67a34
pass pointer for drmModeRmFB
2007-11-05 10:00:11 +00:00
Dave Airlie
82ffcbbd62
drm: more kernel coding style cleanups
2007-11-05 19:14:23 +10:00
Dave Airlie
6ee5412da0
drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.c
2007-11-05 19:09:18 +10:00
Dave Airlie
7ad3890707
drm/ttm: kernel coding style for bo.c and objects.h
2007-11-05 19:05:32 +10:00
Dave Airlie
3b43ed51cc
drm: fix the the typo
2007-11-05 18:56:46 +10:00
Li Zefan
78fe88baee
drm: fix memset size error
...
The size passing to memset is wrong.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
2007-11-05 18:48:27 +10:00
Dave Airlie
921bd07c24
drm: update kernel generator script using v4l script
2007-11-05 12:56:55 +10:00
Dave Airlie
7f6bf84c23
drm: remove lots of spurious whitespace.
...
Kernel "cleanfile" script run.
2007-11-05 12:42:22 +10:00
Dave Airlie
3664de7395
drm: move some of the OS stuff into the OS header
2007-11-05 12:11:39 +10:00
Pekka Paalanen
d81bc78a04
nouveau: more nv20_graph_init.
...
This patch is originally from malc0_, but since it used some NV40_*
regs, I edited them into hex values with a comment.
This seems to correspond quite well with my own mmio-trace,
for the parts I cared to check.
2007-11-04 14:10:00 +02:00
Ben Skeggs
5092865601
nouveau: Use a sw method instead of notify interrupt to signal fence completion.
2007-11-05 05:46:26 +11:00
Ben Skeggs
9096d50df7
nouveau: disable m2mf buffer move for the moment
2007-11-05 05:15:32 +11:00
Ben Skeggs
6abbbb2f4f
Fill fence sequence after emit ioctl.
2007-11-05 04:44:40 +11:00
Ben Skeggs
0a2ab1a900
nouveau: cleanups
2007-11-05 03:53:46 +11:00
Ben Skeggs
c1008104ad
nouveau: only pass annoying messages if irq isn't handled fully.
2007-11-05 02:48:50 +11:00