c20370e096
Don't overwrite TTM page flags.
2007-11-07 18:07:56 +01:00
47497abc1e
i915: oops disable TTM is backwards
2007-11-07 23:10:24 +10:00
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
40fb079aeb
Avoid buffers not ending up on a list in some cases.
2007-11-06 09:47:57 +01:00
20eecf2b88
Add missing drm_regman.c file.
2007-11-06 09:36:29 +01:00
9280076b67
i915: disable TTM on 8xx chips for now until flushing is solved
2007-11-06 18:13:46 +11:00
349eebd567
i915: compat code doesn't work in i8xx hw.
2007-11-06 18:00:10 +11:00
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
b437c8ca0f
drm/agp: kernel style fixes
2007-11-06 12:16:07 +10:00
9493ce6ca3
i915: cleanup most of the whitespace
2007-11-06 12:16:07 +10:00
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
427cc561b3
Export a symbol.
2007-11-05 13:22:00 +01:00
44ad6f409d
Fix a user-buffer check.
2007-11-05 13:20:16 +01:00
1b91113957
remove unused define
2007-11-05 10:06:37 +00:00
306bb12603
remove duplicate and obsolete ioctl statements
2007-11-05 10:05:01 +00:00
71385d6f75
add missing lock
2007-11-05 10:03:26 +00:00
d0956339e3
Use _size
2007-11-05 10:02:46 +00:00
0bee83a8c8
Pass pointer to drmModeRmMode.
2007-11-05 10:00:43 +00:00
5e86f67a34
pass pointer for drmModeRmFB
2007-11-05 10:00:11 +00:00
82ffcbbd62
drm: more kernel coding style cleanups
2007-11-05 19:14:23 +10:00
6ee5412da0
drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.c
2007-11-05 19:09:18 +10:00
7ad3890707
drm/ttm: kernel coding style for bo.c and objects.h
2007-11-05 19:05:32 +10:00
3b43ed51cc
drm: fix the the typo
2007-11-05 18:56:46 +10:00
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
921bd07c24
drm: update kernel generator script using v4l script
2007-11-05 12:56:55 +10:00
7f6bf84c23
drm: remove lots of spurious whitespace.
...
Kernel "cleanfile" script run.
2007-11-05 12:42:22 +10:00
3664de7395
drm: move some of the OS stuff into the OS header
2007-11-05 12:11:39 +10:00
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
5092865601
nouveau: Use a sw method instead of notify interrupt to signal fence completion.
2007-11-05 05:46:26 +11:00
9096d50df7
nouveau: disable m2mf buffer move for the moment
2007-11-05 05:15:32 +11:00
6abbbb2f4f
Fill fence sequence after emit ioctl.
2007-11-05 04:44:40 +11:00
0a2ab1a900
nouveau: cleanups
2007-11-05 03:53:46 +11:00
c1008104ad
nouveau: only pass annoying messages if irq isn't handled fully.
2007-11-05 02:48:50 +11:00
dfa449cf9a
nouveau: vram is bar1
2007-11-05 02:32:46 +11:00
173a5be28f
nouveau: hook up an inital fence irq handler
2007-11-05 02:20:35 +11:00
9a999e57af
nouveau: crappy ttm mm init, disabled for now.
2007-11-05 01:20:32 +11:00
a2e8e294d8
drm: fix oops since user objects..
2007-11-04 11:01:27 +11:00
998d120a47
nouveau: add darktama's email address to authors section.
2007-11-02 19:47:48 -04:00
2dc2ee7a5a
nouveau: put it all together.
2007-11-02 19:47:48 -04:00
c1aa08106e
nouveau: Add darktama's fencing code. Restructure some stuff.
2007-11-02 19:47:48 -04:00
2c6cbea7de
nouveau: incorporate darktama's buffer object work.
2007-11-02 19:47:47 -04:00
239e81093f
nouveau: more filling in for ttm. Change copyright since it's based off of radeon code.
2007-11-02 19:47:47 -04:00
9906c7e54b
Merge branch 'master' into modesetting-101
2007-11-02 16:07:36 +01:00
94c22c3349
User buffer support.
2007-11-02 16:05:25 +01:00
c06808fb65
Return fence errors.
...
Time out properly in the presence of signals.
2007-11-02 15:52:00 +01:00
bb5f2158db
radeon: set the address to access the aperture on the CPU side correctly
...
This code relied on the CPU and GPU address for the aperture being the same,
On some r5xx hardware I was playing with I noticed that this isn't always true.
I wonder if this will fix some of those r4xx DRI issues we've seen in the past.
2007-11-03 00:39:44 +10:00
629c8b0dbf
Merge branch 'master' into modesetting-101
...
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_stub.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
Fixup suspend/resume conflicts (basically use what's in DRM master for now).
Also fix up a few other conflicts that snuck in (i915_dma changes etc.).
2007-11-01 15:27:55 -07:00
128a8f7ea2
Use unsigned long instead of u64 in drm_modeset_ctl_t
...
A bad idea, ABI-wise, but we're going to be changing this structure anyway
before we merge upstream, so just fix the build for now.
2007-11-01 15:02:26 -07:00
00d6026557
Cleanup vblank_init and fix drm_irq_install
...
The vblank_init function wanted a couple of cleanups.
Also, drm_irq_install wasn't checking the new return value of irq_postinstall.
If it returns a failure, assume IRQs didn't get set up and take appropriate
action.
2007-11-01 12:50:03 -07:00
5766d81074
nouveau: don't use AGP on PPC. It's a hopeless case.
2007-11-01 15:49:10 +01:00
Thomas Hellstrom
Dave Airlie
Dave Airlie
Zhenyu Wang
Alan Hourihane
Li Zefan
Pekka Paalanen
Ben Skeggs
Jeremy Kolb
Jesse Barnes
Stephane Marchesin