2b9ef32669
Merge commit 'anholt/drm-gem' into drm-gem
2008-05-06 14:43:56 -07:00
631e86c5c4
Start coding up memory domains
2008-05-06 14:43:49 -07:00
d2373b2a34
GEM: Use irq-based fencing rather than syncing and evicting every exec.
2008-05-06 13:28:26 -07:00
dd6976c56f
GEM: Skip relocation if presumed offset matches.
2008-05-06 11:25:53 -07:00
8551bfc6db
GEM: Save the last ioremapped page for relocations in case we need it again.
2008-05-06 11:18:57 -07:00
91cba3ae17
Dump last batch buffer when hardware lockup is detected.
2008-05-05 22:10:02 -07:00
2c8f970baa
Unlock pages right after getting them.
...
pages come back from find_or_create_page locked, but must not stay locked
for long. Unlock them immediately instead of waiting until we're done with
them to avoid deadlock when applications try to touch them.
2008-05-05 17:17:19 -07:00
5b0d0fa7f8
Merge commit 'anholt/drm-gem' into drm-gem
...
Conflicts:
linux-core/i915_gem.c
2008-05-05 14:40:20 -07:00
dafe48e623
GEM: Replace drm_memrange_for_each with just evicting what we brought in.
...
I was wrong about how the data structure worked, and didn't care to fix it
to support debugging code.
2008-05-05 14:38:26 -07:00
d59a9300ec
Remove some debug messages.
2008-05-05 14:32:01 -07:00
f0bc796a02
Add object base to relocation store address.
...
The relocated value was being written to the wrong location, missing
the object base address.
2008-05-05 14:22:42 -07:00
4867780bd6
Emit clflush and chipset flush when mapping objects to gtt
2008-05-05 13:32:28 -07:00
4511e6cd80
Correct execbuffer offset. Add memory barrier and chipset flush.
2008-05-05 11:27:06 -07:00
b6f173c430
Add i915_dispatch_gem_execbuffer (broken).
...
This function submits a gem-based execbuffer to the ring.
It doesn't work yet.
2008-05-05 10:51:49 -07:00
166ff364fb
Don't forget to set the memrange private, and reset ring on kernel entry.
2008-05-02 17:50:46 -07:00
afe574f328
Don't include the tail guard memrange in foreach callbacking.
2008-05-02 17:49:52 -07:00
5f0614b86f
Check for do_mmap errors
2008-05-02 17:13:11 -07:00
ab3549d133
Add a bit of /proc/dri/*/gem support. Clean up some refcount/pagelock issues.
...
Track named objects in /proc/dri/0/gem_names.
Track total object count in /proc/dri/0/gem_objects.
Initialize device gem data.
return -ENODEV for gem ioctls if the driver doesn't support gem.
Call unlock_page when unbinding from gtt.
Add numerous misssing calls to drm_gem_object_unreference.
2008-05-02 16:34:16 -07:00
39e20bcd5f
Add name/open ioctls, separate handle and pointer ref counts.
...
Names are just another unique integer set (from another idr object).
Names are removed when the user refernces (handles) are all destroyed --
this required that handles for objects be counted separately from
internal kernel references (so that we can tell when the handles are all
gone).
2008-05-02 12:29:17 -07:00
49e8e3372a
Remove drm_driver argument to functions taking drm_gem_object.
...
Now that drm_gem_object has a drm_driver * in it, functions don't need both
parameters.
2008-05-02 10:36:00 -07:00
0d547c9ed9
Add alignment to all aperture allocation requests.
...
When pinning buffers, or using execbuffer, allow the application to specify
the necessary aperture allocation alignment constraints.
2008-05-01 20:41:55 -07:00
30efad5113
Fix gem ioctls to be 32/64-bit clean.
...
mixed 32/64 bit systems need 'special' help for ioctl where the user-space
and kernel-space datatypes differ. Fixing the datatypes to be the same size,
and align the same way for both 32 and 64-bit ppc and x86 environments will
elimiante the need to have magic 32/64-bit ioctl translation code.
2008-05-01 20:31:16 -07:00
abc896638f
Use krefs for refcounting.
...
krefs are way easier than a custom-coded spinlock+int combo.
2008-05-01 20:12:39 -07:00
c10695bb7a
Unbind objects when freeing, fix some error paths, and warn in others.
2008-05-01 17:31:57 -07:00
ddc80651d5
Fix offset passed to AGP to be pages instead of bytes.
...
Fix some utterly bonged loop while we were staring at it.
2008-05-01 17:31:29 -07:00
3f641b56c7
Fix missing member settings in obj/obj_priv, and some error paths.
2008-05-01 16:48:25 -07:00
7d5f783eca
Make GEM object handles be nonzero.
2008-05-01 16:38:37 -07:00
d2529d1396
Remove _args from gem ioctl argument structure tags.
2008-05-01 16:27:03 -07:00
793549116e
Add pin/unpin object ioctls for gem.
2008-05-01 15:40:02 -07:00
ccd1bae0f6
checkpoint: relocations support.
2008-05-01 15:22:21 -07:00
5af87acbc2
checkpoint: gtt binding written.
2008-05-01 14:20:44 -07:00
2140e102f9
checkpoint: rename to GEM and a few more i915 bits.
2008-05-01 11:39:20 -07:00
1a84067950
Hacking towards hooking up execbuffer.
2008-04-30 16:03:15 -07:00
81ba8ded7e
Remove the remainder of the mmfs device.
2008-04-29 13:48:51 -07:00
dabd056bf3
Move mmfs ioctls into the DRM. Untested.
2008-04-29 13:32:52 -07:00
3ad8db2071
Rename drm_mm.c and its fuctions to drm_memrange.
...
It's not really a graphics memory allocator, just something to track ranges
of address space. It doesn't involve actual allocation, and was consuming
some desired namespace.
2008-04-28 16:54:53 -07:00
22877864c2
Add mmap ioctl to mmfs.
2008-04-23 16:22:09 -07:00
8c741ed54e
Add pread/pwrite ioctls to mmfs.
2008-04-23 14:25:54 -07:00
8665b666c7
Move mmfs.h userland interface to shared-core.
2008-04-23 11:23:40 -07:00
47a2b7dc03
Initial add of mmfs module.
2008-04-23 10:42:06 -07:00
c82894034f
Clarify that drm_agp_ttm_backend is associated with a drm_ttm.
...
On first looking at it I assumed it was an aspect of the ttm backend as a
whole rather than specific allocations from a backend.
2008-04-23 10:42:06 -07:00
b3967765c0
linux-core Makefile: add GIT_REVISION
...
This tries to automatically fetch a git revision string and if succeeds,
it #defines GIT_REVISION string macro. Packagers can override it by
'make GIT_REVISION=foo'.
Update Nouveau to use GIT_REVISION, if defined, instead of DRIVER_DATE
in struct drm_driver.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-04-22 22:07:21 +03:00
1ad1bd5bd9
Fix buffer object map wait error.
...
Add some branch prediction hints.
2008-04-14 13:52:33 +02:00
c5955c6523
Fix buffer object creation validation.
...
BO lock fixes.
2008-04-14 12:14:20 +02:00
c9b73ef6da
Unlock the BO mutex while waiting for idle, unmapped, unfenced.
...
Move unfenced checking into idle checking.
Never time out while waiting for software events like unmapped or unfenced.
2008-04-14 12:13:33 +02:00
65dd0e68ff
Fix up buffer manager locking.
2008-04-14 12:13:17 +02:00
b986d7d2c9
Save and restore dsparb and d_state regs
2008-04-11 20:31:07 -07:00
db61f02bd7
Missing KERNEL_VERSION macro
2008-04-07 22:24:24 +02:00
dfa9f03992
nouveau: enable accelerated move to sysmem
2008-04-07 13:29:11 +10:00
c12b60b509
nouveau: enable m2mf for tt<->vram moves, fix fence_poll
2008-04-07 13:05:51 +10:00
Keith Packard
Eric Anholt
Pekka Paalanen
Thomas Hellstrom
Patrice Mandin
Ben Skeggs