Dave Airlie
717dd804d0
drm: fixup master code to use krefs
2008-08-04 14:54:32 +10:00
Dave Airlie
af6efc3d77
i915/radeon: use rmmap locked
2008-08-04 14:54:02 +10:00
Dave Airlie
129c8a1181
modesetting: pick_crtcs can't be static
2008-08-04 14:53:14 +10:00
Dave Airlie
922f74f3c9
drm: remove unneeded debugging
2008-08-04 14:52:58 +10:00
Kristian Høgsberg
086716c8e2
Merge commit 'origin/drm-gem' into modesetting-gem
...
Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-08-01 13:35:56 -04:00
Dave Airlie
4585787bd1
Revert "i915: Move all of the irq install/uninstall to load time."
...
This reverts commit 965a72202b
.
Please re-do over properly
2008-08-01 07:43:58 +10:00
Kristian Høgsberg
5052e966ec
Merge commit 'origin/master' into modesetting-gem
...
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
2008-07-31 15:18:32 -04:00
Dave Airlie
296073dc5f
drm: remove object hash
2008-07-31 14:39:25 +10:00
Dave Airlie
d2d7f3069d
drm: userspace rip out TTM API
2008-07-31 13:31:30 +10:00
Dave Airlie
10d5b037b8
drm: add fault handler support so as to be more like possible upstream
2008-07-31 13:12:36 +10:00
Dave Airlie
55761b2fe7
drm: add fault handler support so as to be more like possible upstream
...
(cherry picked from commit 10d5b037b8
)
2008-07-31 13:11:28 +10:00
Dave Airlie
9b8d71b5eb
TTM: remove API and userspace objects.
...
This removes all the TTM userspace API and all userspace objects.
It also removes the drm_bo_lock.c code
2008-07-31 12:54:48 +10:00
Eric Anholt
ccbaad52f7
intel-gem: Replace version bump signalling GEM with I915_PARAM_HAS_GEM.
2008-07-30 14:10:36 -07:00
Kristian Høgsberg
6d4e147480
Make it compile again.
2008-07-30 16:34:37 -04:00
Eric Anholt
689548b527
intel-gem: Remove dead field from reverted changes.
2008-07-30 11:29:32 -07:00
Eric Anholt
33c8e03787
Revert "Rename drm_mm.c and its fuctions to drm_memrange."
...
This reverts commit 3ad8db2071
.
We ended up not needing that namespace, and I'd rather not have the churn
for producing diffs.
2008-07-30 11:25:34 -07:00
Dave Airlie
fb5542aaa8
radeon: hack gem to get an offset back for Mesa.
2008-07-30 17:06:11 +10:00
Dave Airlie
d659302e09
radeon: add some handles to the sarea + kernel mm available check
2008-07-30 17:05:50 +10:00
Dave Airlie
95c02743c9
i915: more version checks
2008-07-30 16:52:13 +10:00
Dave Airlie
02b09d271c
i915: add version checks for opregion on old kernels
2008-07-30 16:26:59 +10:00
Eric Anholt
8fc72aef70
intel-gem: actually add i915_gem_debug.c.
2008-07-29 20:26:38 -07:00
Eric Anholt
0f78e30e0a
intel-gem: Check return value of pci_read_base.
2008-07-29 11:10:47 -07:00
Nicolai Haehnle
90b90c65dc
r300: Fix cliprect emit
...
This makes our handling of cliprects sane. drm_clip_rect always has exclusive
bottom-right corners, but the hardware expects inclusive bottom-right corners,
so we adjust this here.
This complements Michel Daenzer's commit 57aea290e1e0a26d1e74df6cff777eb9f038f1f8
to Mesa. See also http://bugs.freedesktop.org/show_bug.cgi?id=16123 .
2008-07-29 19:59:08 +02:00
Dave Airlie
0452be8826
radeon: move code around putting emit into cs
2008-07-29 18:05:11 +10:00
Dave Airlie
4234f82acc
radeon_cs: add relocate hook for mm and non-mm relocations
2008-07-29 16:51:47 +10:00
Eric Anholt
0e49e49c9f
intel: Fix typo in unused register definition name.
2008-07-28 23:14:47 -07:00
Eric Anholt
e68b57c17d
intel-gem: checkpatch.pl on drm_proc.c new contents.
2008-07-28 23:12:41 -07:00
Eric Anholt
1d2bb68d28
Merge commit 'origin/master' into drm-gem
...
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-07-28 23:12:26 -07:00
Stuart Bennett
6b903f5edf
nouveau: fix nv04 fifo context save to save reg contents, not reg offset
...
clearly the function had never been used :)
2008-07-29 02:32:13 +01:00
Stuart Bennett
591f6bcba3
nouveau: fix bad rename from 5a072f32c8
2008-07-29 02:26:34 +01:00
Eric Anholt
487c42bd42
intel-gem: Another checkpatch.pl pass.
2008-07-28 11:45:22 -07:00
Eric Anholt
1bdf35fe19
intel-gem: Fix regression tests.
...
Main fix is an oops that was triggered by the gtt pwrite path when we don't
have the gtt initialized. Also, settle on -EBADF for "bad object handle",
and -EINVAL for "reading/writing beyond object boundary".
2008-07-28 11:29:16 -07:00
Eric Anholt
f85fd1b42d
intel-gem: Speed up tiled readpixels by tracking which pages have been flushed.
...
This is around 3x or so speedup, since we would read wide rows at a time, and
clflush each tile 8 times as a result. We'll want code related to this anyway
when we do fault-based per-page clflushing for sw fallbacks.
2008-07-28 11:25:19 -07:00
Alan Hourihane
478e019cb7
set to 2.4.0
2008-07-28 15:16:45 +01:00
Dave Airlie
42e373e903
radeon_cs: extract some offsets from packet data
2008-07-28 18:18:28 +10:00
Dave Airlie
87520347b4
r300: add some packet 3 decodes
2008-07-28 17:42:53 +10:00
Dave Airlie
dc3a7c023d
r300: initial command stream parser for packet 0.
...
this at least parses the DDX stream and lets me run gnome-terminal/metacity
2008-07-28 17:27:24 +10:00
Dave Airlie
38835f9cd2
radeon command submission start
...
take code from Jerome munge into a TTM IB re-use
2008-07-28 15:21:13 +10:00
Eric Anholt
04ae66db1c
intel-gem: Move debug-only functions to a separate file.
2008-07-26 19:52:47 -07:00
Alex Deucher
5282a505b6
NV50: s/FALSE/false/
2008-07-26 16:57:02 -04:00
Stefan Becker
514c05cebe
radeon: Add suspend/resume hooks for saving/clearing/restoring interrupts.
...
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16799 .
2008-07-26 16:49:14 +02:00
Nicolai Haehnle
c3d463840c
r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEX
...
DRAW_INDEX writes a vertex count to VAP_VF_CNTL. Docs say that behaviour
is undefined (i.e. lockups happen) when this write is not followed by the
right number of vertex indices.
Thus we used to do the wrong thing when drawing across many cliprects was
necessary, because we emitted a sequence
DRAW_INDEX, DRAW_INDEX, INDX_BUFFER, INDX_BUFFER
instead of
DRAW_INDEX, INDX_BUFFER, DRAW_INDEX, INDX_BUFFER
The latter is what we're doing now and which ought to be correct.
2008-07-26 16:40:51 +02:00
Dave Airlie
0443d2a32a
tests: add some basic radeon gem tests
2008-07-26 08:56:43 +10:00
Dave Airlie
df9871064e
radeon: add initial atombios modesetting and GEM -> TTM translation layer.
...
This is an initial import of the atom bios parser with modesetting support
for r500 hw using atombios. It also includes a simple memory manager
layer that translates a radeon GEM style interface onto TTM internally.
So far this memory manager has only been used for pinned object allocation
for the DDX to test modesetting.
2008-07-26 08:56:23 +10:00
Dave Airlie
31da9492a4
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-26 08:46:38 +10:00
Dave Airlie
7fd7ba87f3
drm: don't set the signal blocker on the master process.
...
this lets us debug the X server through xkb startup.
Not sure what the correct answer is, probably X needs to drop
the lock when execing stuff, with input hotplug it can get
xkb stuff at any time I believe.
2008-07-26 08:46:09 +10:00
Dave Airlie
66723c09f5
modesetting: pass file priv to cursor
2008-07-26 08:43:59 +10:00
Dave Airlie
2be292f6ea
nv50: remove TRUE/FALSE
2008-07-26 08:43:01 +10:00
Dave Airlie
11d3075087
modesetting: pass file_priv into cursor set functions
2008-07-26 08:41:01 +10:00
Dave Airlie
fb05c4d621
Merge remote branch 'origin/modesetting-101' into modesetting-gem
2008-07-26 08:38:59 +10:00