03c137c5f8
Remove the buffer manager mutex. Use dev->struct_mutex instead.
...
Add a function to free buffers on hold for destruction if their
fence object has expired.
Add a timer to periodically call that function when there are
buffers pending deletion.
2006-08-31 15:36:40 +02:00
ec8c79b79d
More mapping synchronization.
...
libdrm validate and fencing functions.
2006-08-31 14:10:13 +02:00
ed9de124cc
Lindenting drm_bo.c and drm_ttm.c
2006-08-30 21:31:38 +02:00
914a77a15a
Buffer object binding.
...
Some code reordering.
2006-08-30 21:30:47 +02:00
611662ab28
Buffer eviction.
...
Reworked map refcounting so that any process waiting on buffer object unmap
will allow in other processes to unmap the buffer object.
2006-08-30 20:23:40 +02:00
d39055174b
Remove the buffer object hint field and use it only
...
as an argument.
Validate stub.
2006-08-30 17:40:07 +02:00
14a835be61
Buffer object mapping and mapping synchronization for multiple clients.
2006-08-30 15:08:40 +02:00
e47a4fda2e
Memory manager init and takedown.
2006-08-30 13:04:08 +02:00
033bda07e9
Buffer object reply fill in.
...
Lindent of drm_bo.c drm_ttm.c
2006-08-30 09:57:35 +02:00
23f01c9fe8
Checkpoint commit. Buffer object flags and IOCTL argument list.
2006-08-29 18:40:08 +02:00
0dedfc2cd0
Checkpoint ttm addition to buffer objects.
2006-08-29 14:52:02 +02:00
279e8d26c6
64-bit IOCTL integer (Michel Dänzer & Brian Paul)
2006-08-29 10:45:34 +02:00
2057406470
Buffer object creation.
2006-08-28 17:51:53 +02:00
0d67356de4
Proper TTM dereferencing
...
Initial buffer object creation.
2006-08-28 16:36:37 +02:00
3cfab681b3
Merge branch 'master' into nouveau-1
2006-08-29 00:01:19 +10:00
05536a6478
Buffer object idle and mapping synchronization.
2006-08-28 13:51:39 +02:00
480ea65ee4
Checkpoint buffer object IOCTL stub.
2006-08-28 10:58:21 +02:00
e181f594a4
Add a 64-bit drm unsigned type for 64-bit clean IOCTLS.
...
Conversion functions in drmP.h and xf86drm.c.
2006-08-28 09:49:09 +02:00
4ddabd1562
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch
...
Conflicts:
linux-core/drmP.h
2006-08-28 09:28:10 +02:00
9b984b34e9
drm: lots of small cleanups and whitespace issues fixed up
...
remove a mach64 warning, align a lot of things from linux kernel
2006-08-28 11:31:43 +10:00
60ddaaf2e0
add static function, and remove bad attributions
2006-08-28 11:28:38 +10:00
3586ecd060
fix const pointer warnings with file_operations
2006-08-28 11:27:13 +10:00
205c573e44
remove local copies of pci domain/bus/slot/num
2006-08-28 11:27:09 +10:00
b4feb2c04e
remove some DRM_ARRAY_SIZE from linux core code
2006-08-28 11:27:05 +10:00
3a91e1a5fb
fixup some of the comments in drm_context.c
2006-08-28 11:27:01 +10:00
27c72b67ec
drm: i810_dma.c: fix pointer arithmetic for 64-bit target
...
First warning result from open-coded PTR_ERR,
the rest is caused by code like this:
*(u32 *) ((u32) buf_priv->kernel_virtual + used)
I've also fixed a missing PTR_ERR in i830_dma.c
From: Denis Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-08-28 11:26:57 +10:00
886d3b3061
Bugfixes.
2006-08-27 22:01:33 +02:00
b4b7b99760
Remove the ioctl multiplexing, and instead allow for generic
...
drm ioctls 0x80 - 0xFF.
2006-08-27 21:16:13 +02:00
ac26b51503
Have TTM create and reference ioctl call return the actual TTM size.
2006-08-27 19:45:38 +02:00
4fa58aa152
Add TTM map handle on reference.
2006-08-27 19:07:38 +02:00
65e7274008
ttm create / destroy / ref / unref ioctl.
2006-08-27 19:03:20 +02:00
fef9b30a2b
initial import of nouveau code from nouveau CVS
2006-08-27 08:55:02 +10:00
c488e25ceb
More ioctl stubs.
...
Buffer object locking order documentation.
2006-08-25 20:03:39 +02:00
35c8ce6c29
ttm and buffer objects ioctl stubs.
2006-08-25 19:03:42 +02:00
1d3cf107d2
Module protection map access is moving into mainline kernels.
...
Update drm_compat accordingly.
(Reported by Dave Airlie)
2006-08-25 18:14:22 +02:00
4c03030b12
Checkpoint commit
...
Buffer object code.
2006-08-25 18:05:35 +02:00
ea57099973
Fix previous commit: Only fall back to hashed handles
...
when there is a duplicate handle error. Not for other errors.
2006-08-23 13:49:13 +02:00
8fa43d4b2f
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch
2006-08-23 13:31:45 +02:00
459b234d79
Allow multiple addMaps with the same 32-bit map offset.
...
(Reported by Dave Airlie)
2006-08-23 11:31:10 +02:00
8dfe917cb2
Fix hashtab implementation leaking illegal error codes to user space.
...
(Reported by Dave Airlie)
2006-08-23 11:21:33 +02:00
e201511a0f
More ttm cleanups.
2006-08-22 11:57:08 +02:00
ca4e34e532
ttm code cleanup.
...
Fix the sleep-in-page-table-spinlock bug discovered by Dave Airlie
2006-08-22 11:19:53 +02:00
a6535c8db4
Add a fence object class field for future use (For example VSYNC fence objects)
2006-08-22 10:44:09 +02:00
7058d06317
Initial i915 buffer object driver
2006-08-22 10:24:48 +02:00
b81ca5e031
AGP backends for TTM.
2006-08-22 10:09:57 +02:00
700bf80ca9
Bring in stripped TTM functionality.
2006-08-22 09:47:33 +02:00
8d5b7c77f9
Allow longer sequence lifetimes.
2006-08-21 21:37:43 +02:00
e089de33e8
i915 fence object driver implementing 2 fence object types:
...
0x00 EXE fence. Signals when command stream interpreter has reached the point
where the fence was emitted.
0x01 FLUSH fence. Signals when command stream interpreter has reached the point
where the fence was emitted, and all previous drawing operations have been
completed and flushed.
Implements busy wait (for fastest response time / high CPU) and
lazy wait (User interrupt or timer driven).
2006-08-21 21:36:00 +02:00
6571f74a49
Remove some accidently included TTM code.
2006-08-21 21:12:29 +02:00
657bacc395
Add missing fence type define.
...
Add drm_fence.o to Makefile
2006-08-21 21:04:36 +02:00
166da9355d
User / Kernel space fence objects (device-independent part).
2006-08-21 21:02:08 +02:00
1c787f0d39
Backwards compatibility code for ttms.
2006-08-21 20:38:57 +02:00
42c2cfcf7d
Generic DRM support base-class support for user-space objects, like
...
fence objects and buffer objects:
Refcounting,
Inter-process sharing,
Synchronization
Destruction.
2006-08-21 20:30:19 +02:00
11f9e404fb
Avoid using vmalloc for small hash tables.
2006-08-21 17:02:44 +02:00
0afb877a37
drm: lots of small cleanups and whitespace issues fixed up
...
remove a mach64 warning, align a lot of things from linux kernel
2006-08-19 17:59:18 +10:00
78634c14a8
add static function, and remove bad attributions
2006-08-19 16:56:03 +10:00
d90a55fe34
fix const pointer warnings with file_operations
2006-08-19 16:55:30 +10:00
3a681bb4c1
remove local copies of pci domain/bus/slot/num
2006-08-19 16:55:00 +10:00
cc71393559
remove some DRM_ARRAY_SIZE from linux core code
2006-08-19 16:43:16 +10:00
4b38f72672
fixup some of the comments in drm_context.c
2006-08-19 16:36:26 +10:00
f89a576aec
drm: i810_dma.c: fix pointer arithmetic for 64-bit target
...
First warning result from open-coded PTR_ERR,
the rest is caused by code like this:
*(u32 *) ((u32) buf_priv->kernel_virtual + used)
I've also fixed a missing PTR_ERR in i830_dma.c
From: Denis Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
2006-08-19 16:31:34 +10:00
0316f93d51
Remove hash tables on DRM exit.
2006-08-16 16:36:56 +02:00
4daa024918
Avoid kernel oops in some error paths calling drm_lastclose().
2006-08-14 17:11:14 +02:00
0d60cd0036
remove all TRUE instances as well
2006-08-14 11:52:34 +10:00
18a48a9267
remove all TRUE/FALSE no need for this in the drm, use 0 or 1
2006-08-14 11:49:52 +10:00
5340a70227
cleanup some whitespace issue and move compat code to compat header
2006-08-10 14:32:18 +10:00
28069ff10f
drm: ati_pcigart cleanup
...
use NULL instead of 0, cleanup some whitespace
2006-08-10 14:31:22 +10:00
e524028630
drm: whitespace cleanup in new files
2006-08-07 21:34:40 +10:00
4b3ea90bc4
drm: remove extra whitespace from drm_mm.c
2006-08-07 21:00:13 +10:00
248d1a32a2
drm: fixup whitespace and style for Linux kernel import
2006-08-07 20:56:38 +10:00
09c901e4bd
remove incorrect exit marking on cleanup pci as this is called from other paths
2006-07-24 11:09:41 +10:00
5cfbd5dbab
switch drm to use Linux mutexes instead of semaphore.
...
I hope the fallback compat code works if not shout at me.
2006-07-24 10:51:27 +10:00
b9243ce3d5
.cvsignore -> .gitignore
...
Sort the merged file, remove the redundant explicit .ko lines and add
some generated symlinks.
2006-07-19 18:31:43 +02:00
126673d62a
Keep hashed user tokens, with the following changes:
...
32-bit physical device addresses are mapped directly to user-tokens. No
duplicate maps are allowed, and the addresses are assumed to be outside
of the range 0x10000000 through 0x30000000. The user-token is identical
to the 32-bit physical start-address of the map.
64-bit physical device addressed are mapped to user-tokens in the range
0x10000000 to 0x30000000 with page-size increments. The user_token should
not be interpreted as an address.
Other map types, like upcoming TTM maps are mapped to user-tokens in the
range
0x10000000 to 0x30000000 with page-size increments. The user_token should
not be interpreted as an address.
This keeps compatibility with buggy drivers, while still implementing a
hashed map lookup. The SiS and via device driver major bumps are
reverted.
2006-07-11 14:37:37 +00:00
a392349691
Change drm Map handles to be arbitrary 32-bit hash tokens in the range
...
0x10000000 to 0x90000000 in PAGE_SIZE increments.
Implement hashed map lookups.
This potentially breaks both 2D and 3D drivers. If so, the corresponding
2D and 3D driver should be fixed, and it's corresponding drm device driver
should have its major bumped as soon as possible.
Bump sis and via drm device driver majors.
The SiS and Unichrome 3D drivers are fixed in Mesa CVS HEAD and
mesa_6_4_branch.
2006-07-10 13:00:21 +00:00
c21a7b763a
SiS 315 Awareness.
2006-07-05 15:52:35 +00:00
264f60ded4
Add missing semaphore release.
2006-07-05 14:39:22 +00:00
aafedbf7c5
Fix compilation problem on 2.6.9 kernels (bug #6211 )
2006-06-23 16:29:39 +00:00
58b63ee5cc
Fix buffer cleanup on close. Move memory manager reset from final_context
...
to lastclose.
2006-06-19 09:12:50 +00:00
0203edaa21
via: Return the requested size instead of the correct size of the allocated
...
regions. The 2D driver and XvMC lib has problems when the returned size
is not the same as the allocated size.
2006-06-16 15:20:20 +00:00
ca1a77683d
via:
...
-Remove out of memory error message.
-Move sman cleanup from final_context to lastclose.
-Add the P4VM800PRO (?) PCI ID.
2006-06-15 18:37:05 +00:00
6c7faf5814
s/list_entry/drm_hash_entry/ for "drm_hash_item"s.
2006-06-06 17:52:03 +00:00
1a9e5bae10
Fix drm_remove_magic potential memory leak / corruption. Move drm
...
authentication token hashing to new generic hash table implementation.
2006-06-06 17:46:17 +00:00
6bacb180ce
Merge in the drm-sman-branch
2006-06-06 14:19:00 +00:00
79e5969172
rip out unneeded back compat code
2006-05-19 04:11:22 +00:00
d365f03129
fixup GFP_COMP for older kernels and get_page/put_page for newer
2006-04-23 09:05:05 +00:00
4f53bf3545
remove stupid init and exit flags..
2006-04-05 01:23:57 +00:00
ac5bd25208
make add context non master...
2006-04-03 08:06:51 +00:00
6bb92ab086
fix issue in mga from kernel
2006-03-19 07:53:46 +00:00
9c0634bbad
set dma pages reserved
2006-02-21 11:10:05 +00:00
abd3904bf0
use coherent memory for PCI allocations with COMP flag
2006-02-21 10:28:47 +00:00
0a211db23c
experimental PCI DMA fixes use proper Linux interfaces
2006-02-19 12:08:14 +00:00
a25667894a
make some functions static from the kernel
2006-02-18 05:43:19 +00:00
b2523e7aa1
always enable and set master on pci device
2006-02-18 04:18:45 +00:00
08fafc424a
fix build wrong function call
2006-02-18 03:01:38 +00:00
4791dc8856
major realigment of DRM CVS with kernel code, makes integration much easier
2006-02-18 02:53:36 +00:00
585f34c3e5
fix card unload
2006-02-18 02:38:07 +00:00
ff9ecc09f9
Fixup test for memory at end of memory space
2006-02-18 02:34:53 +00:00
07e1126bde
add missing name, desc, date, major, minor and patchlevel entries
2006-01-26 12:14:09 +00:00
d394c9fa08
via: direction bug in get_user_pages call in via_dmablit.c fixed. Bumped
...
minor since this causes the via DDX to fail with vlc video player.
2006-01-12 19:08:16 +00:00
661004544c
via: Combine PCI DMA transfers with stride==width (Idea from Luc
...
Verhaegen). A somewhat saner PCI DMA transfer size check. Fix some
typos. Bump patchlevel.
2006-01-06 11:19:06 +00:00
3f23f9b99d
nothing from VIA or S3 in this
2006-01-02 09:17:41 +00:00
92150972e5
use drm_cards_limit instead of cards_limit
2006-01-02 05:54:10 +00:00
781d96c61f
use common read/write routines
2006-01-02 05:52:17 +00:00
8fef6fe4f0
sparse cleanups
2006-01-02 05:43:04 +00:00
dcbcc60864
align spacing with kernel
2006-01-02 05:38:03 +00:00
42cd50fa90
Realign via driver with changes in Linux kernel (mainly whitespace)
2006-01-02 03:25:49 +00:00
b14d15ac41
Add vblank support to i915 DRM..
2005-12-28 23:49:59 +00:00
be16e93537
Fix from SuSE for issue with context creation failure
2005-12-04 01:24:23 +00:00
0db80529d5
Fix from Hugh Dickins for consistent mapping
2005-11-29 09:46:27 +00:00
c8261e3d24
Loosen via dmablit alignment checks somewhat. Adapt stride check to maximum
...
sceen size for EXA.
2005-11-15 11:20:47 +00:00
b5d71f63cd
enable i915 32/64 bit ioctls
2005-11-11 12:23:18 +00:00
eff1b8fbdf
i810 should be fine with i810.. no idea what this crack is ..
2005-11-11 10:52:23 +00:00
cd4a9ad8e2
whitespace align with kernel
2005-11-11 09:21:05 +00:00
a204d5acb2
realign whitespace with kernel
2005-11-11 09:09:03 +00:00
36356df3cb
A bunch of create_proc_dir_entry() calls creating directories had crept in
...
since the last sweep; converted to proc_mkdir().
From: Al Viro (via kernel)
2005-11-11 08:59:57 +00:00
ea07fefcbf
convert to use __set_current_state, align some header includes
2005-11-11 08:42:36 +00:00
33fbf8b7e2
whitespace align closer with kernel
2005-11-11 08:07:11 +00:00
9a91674d45
cleanup ioctl/max_ioctl to use header file for extern symbols
2005-11-11 07:45:46 +00:00
b84daa8f32
Fix cpu_to_le32 same as kernel not sure it is correct for ppc
2005-11-10 10:14:48 +00:00
fb22dfbfc1
cleanup / whitespace align with kernel
2005-11-10 10:13:25 +00:00
a10d8178e3
Initial port of savage to FreeBSD for the AGP and !ShadowStatus case. Adds
...
drm_mtrr_{add,del} for handling the MTRR setup. Still has a LOR issue
with DRM_VERIFYAREA_READ/DRM_COPY_FROM_USER_UNCHECKED in savage_bci.c
-- this won't work with the fine-grained locking in use, and just doing
a single copyin to a temporary will probably work fine. Also note that
the module leaks approximately 4 kb on unload.
2005-11-08 20:25:00 +00:00
1a256df480
Catch FreeBSD up to the pcie gart changes. Required minor modification to
...
radeon_cp.c to use a drm_local_map_t-type mapping (drm_core_ioremap
rather than drm_ioremap), which contains private device mapping
information on BSD. I also changed the ati_pcigart interface to use
"void *" for pointers to kva rather than "unsigned long". While PCIGART
support appears to be broken on FreeBSD currently, I think this is not
new, and BusType PCI remains working on my r100 in Linux.
2005-11-08 02:38:01 +00:00
3fce085e13
Fix bug #4908 for now. Alternative is highlighted in this bug report as the
...
better future direction.
2005-11-07 13:17:41 +00:00
39615ec06e
Converts the remaining drm_agp_foo functions to be a drm_agp_foo and
...
drm_agp_foo_ioctl pair. Modifies the MGA DRM to use the drm_agp_foo
functions instead of the drm_foo_agp functions. The drm_foo_agp
functions are no longer exported by drm.ko.
Ensures that dma->seg_count and dma->page_count are properly set in
drm_addbufs_{agp,sg,fb}. drm_addbufs_pci was already correct.
Ensures that mga_do_agp_dma_bootstrap correctly sets agp_buffer_token.
At this point PCI DMA is still broken.
Xorg bug: #4797 Reviewed by: Dave Airlie, Eric Anholt Signed-off-by: Ian
Romanick <idr@us.ibm.com>
2005-11-03 00:38:25 +00:00
bcbf5ff797
we don't use this stuff anymore .. remove 1k buffer from driver ..
2005-10-23 04:07:50 +00:00
00d4957d62
Don't set MTRR's for intel hardware
2005-10-21 08:59:56 +00:00
cf8ce0888a
via: PCI DMA bugfixes and DOS due to too many mapped pages checks.
2005-10-20 17:37:32 +00:00
308b40ea09
The Linux 2.6.9 (and earlier) fops structure does not contain a
...
.compat_ioctl field. This change makes the DRM build on those kernels.
Signed-off-by: Ian Romanick <idr@us.ibm.com>
2005-10-11 17:34:49 +00:00
62a4673034
Skeleton nv drm driver, to enable DMA in EXA. (Lars Knoll, minor updates by
...
me)
2005-10-06 23:31:29 +00:00
908ad0ed96
remove version not used anymore
2005-10-06 23:08:58 +00:00
ace8b912fb
fix header this is now a c file
2005-09-30 09:09:03 +00:00
f42cdc8dcb
Add support to turn writeback off via radeon module option
2005-09-30 06:41:10 +00:00
856bdf0f67
fixup bens fix so it works..
2005-09-30 03:39:02 +00:00
68b4ad3cce
Add Bens fix for radeon maps on ppc
2005-09-30 03:14:18 +00:00
9d24d951f7
via: fix stray error printout message.
2005-09-25 14:38:07 +00:00
903e5701ff
Add the via PCI DMA blit code.
2005-09-25 12:54:12 +00:00
c1b7df95be
add __ATTR
2005-09-25 05:19:06 +00:00
3a0230ef9c
use linux kernel macros don't make our own
2005-09-25 03:09:51 +00:00
cd16d96856
remove pci_find_class use for alpha
2005-09-18 09:31:06 +00:00
f5c81b2620
compat for pci_pretty_name
2005-09-17 04:16:51 +00:00
3f6fcbc676
back out change as gart is now in framebuffer for PCIE
2005-09-11 09:58:19 +00:00
5565a00916
Add GART in FB support for ati pcigart, and PCIE support for r300
2005-09-11 08:51:23 +00:00
29326c1a89
fix makefile bug
2005-09-11 07:08:46 +00:00
0d346a07a8
convert ioctl flags to use flags instead of separate ints
2005-09-03 03:27:14 +00:00
80ed93c7bf
check is the map containing the lock
2005-09-03 02:21:22 +00:00
01e4364a8f
remove i915_pm code as it causes too many issues with current software
...
suspend, and the DDX driver re-inits the board successfully anyway.
2005-08-22 09:50:12 +00:00
54947504ac
allocating the PCIE table from GFP_DMA seems to stop it NMI'ing
2005-08-21 11:07:03 +00:00
5c4ce6d93c
add x86_64 to the list as well
2005-08-20 07:38:11 +00:00
d12768f79a
remove checks that make ppc64 not work properly... also fix ppc64 check..
...
we should be safe doing this..
2005-08-20 07:33:07 +00:00
Thomas Hellstrom
Dave Airlie
Dave Airlie
Michel Dänzer
Thomas Hellstrom
Alan Hourihane
Thomas Hellstrom
Eric Anholt
Ian Romanick
Adam Jackson