Michel Dänzer
35066b51ef
Revert "Make sure busmastering gets disabled on module unload."
...
This reverts af7b89d724
commit. It causes an oops
on X server shutdown here, and for the reporter of bug #7629 as well.
2006-07-26 18:21:32 +02:00
Michel Dänzer
645453ce11
Bug #7629 : Fix for CHIP_IS_AGP getting 'restored' with non-AGP cards
...
Commit 2a47f6bfec
caused the CHIP_IS_AGP flag to
get 'restored' with PCI(e) cards. I can't think of a way to fix this without
introducing a (otherwise redundant) CHIP_IS_PCI flag.
2006-07-26 18:19:27 +02:00
Dave Airlie
09c901e4bd
remove incorrect exit marking on cleanup pci as this is called from other paths
2006-07-24 11:09:41 +10:00
Dave Airlie
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
Adam Jackson
6677e2a10b
Delete the pre-core DRM code with extreme prejudice.
2006-07-19 16:19:25 -04:00
Adam Jackson
af7b89d724
Make sure busmastering gets disabled on module unload.
2006-07-19 15:35:31 -04:00
Michel Dänzer
d5e0f8bdaf
Use RADEON_RB3D_DSTCACHE_CTLSTAT instead of RADEON_RB2D_DSTCACHE_CTLSTAT.
...
The latter seems to be a read-only mirror of the former.
2006-07-19 19:18:32 +02:00
Michel Dänzer
2a47f6bfec
Make sure CHIP_IS_AGP flag is set when not overriding to PCI mode.
...
This allows using AGP after overriding to PCI mode in a previous session
without reloading the DRM.
2006-07-19 19:16:26 +02:00
Michel Dänzer
c91748e702
When writeback isn't used, actually disable it in the hardware.
...
Not doing this might waste bus bandwidth or even cause memory corruption or
system crashes on systems that check bus transfers. No such incident has been
reported though.
2006-07-19 19:13:00 +02:00
Michel Dänzer
e337eadcec
Implement RADEON_PARAM_SCRATCH_OFFSET getparam.
...
When this succeeds, userspace can read the scratch register contents from the
mapped writeback page directly.
2006-07-19 19:07:06 +02:00
Michel Dänzer
7dea64677b
Some debug output when the getparam ioctl is called with an unknown parameter.
2006-07-19 19:01:33 +02:00
Michel Dänzer
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
Thomas Hellstrom
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
Thomas Hellstrom
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
Thomas Hellstrom
c21a7b763a
SiS 315 Awareness.
2006-07-05 15:52:35 +00:00
Thomas Hellstrom
264f60ded4
Add missing semaphore release.
2006-07-05 14:39:22 +00:00
Adam Jackson
56b0733852
Disable building static libraries. Bump to 2.0.2 for header updates.
2006-06-27 21:04:50 +00:00
Alan Hourihane
aafedbf7c5
Fix compilation problem on 2.6.9 kernels (bug #6211 )
2006-06-23 16:29:39 +00:00
Keith Packard
da143d0606
Remove spurious debug messages from i915 vblank config paths
2006-06-22 21:34:44 +00:00
Keith Packard
f8891ef802
i915: Save vblank pipe configuration to restore on resume
2006-06-21 00:15:10 +00:00
Keith Packard
83f256e60e
Add i915 ioctls to configure pipes for vblank interrupt.
...
i915 vblanks can be generated from either pipe a or b, however a disabled
pipe generates no interrupts. This change allows the X server to select
which pipe generates vblank interrupts.
2006-06-19 20:15:53 +00:00
Thomas Hellstrom
58b63ee5cc
Fix buffer cleanup on close. Move memory manager reset from final_context
...
to lastclose.
2006-06-19 09:12:50 +00:00
Thomas Hellstrom
96f272884d
via: Bump version number and date.
2006-06-19 09:01:31 +00:00
Thomas Hellstrom
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
Thomas Hellstrom
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
Thomas Hellstrom
6c7faf5814
s/list_entry/drm_hash_entry/ for "drm_hash_item"s.
2006-06-06 17:52:03 +00:00
Thomas Hellstrom
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
Thomas Hellstrom
6bacb180ce
Merge in the drm-sman-branch
2006-06-06 14:19:00 +00:00
Thomas Hellstrom
838b03f7aa
file via_mm.c was initially added on branch drm-sman-branch.
2006-05-28 16:20:29 +00:00
Thomas Hellstrom
7fbfb53c00
file drm_sman.h was initially added on branch drm-sman-branch.
2006-05-28 16:20:29 +00:00
Thomas Hellstrom
09872c9ab3
file sis_mm.c was initially added on branch drm-sman-branch.
2006-05-28 16:20:29 +00:00
Thomas Hellstrom
36160c8060
file drm_sman.c was initially added on branch drm-sman-branch.
2006-05-28 16:20:29 +00:00
Thomas Hellstrom
31a80d39e5
file drm_hashtab.h was initially added on branch drm-ttm-branch.
2006-05-26 19:33:02 +00:00
Roland Scheidegger
f4e6e4499c
Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new
...
packet type for making it possible to address whole tcl vector space
and have a larger count)
2006-05-24 18:36:24 +00:00
Roland Scheidegger
9e0320a0ad
add forgotten register define for previous commit
2006-05-20 09:20:05 +00:00
Roland Scheidegger
e1b627c17e
Do a tcl state flush before accessing tcl vector space. This fixes some
...
more problems with flickering (bug #6637 ). drm may not be appropriate
place for this, since doing that flush there might both be overkill and
insufficient in some cases. However, it's hard to figure out when that
flush is needed, so this has to suffice. There does not seem to be a
performance penalty associated with it.
2006-05-20 09:08:18 +00:00
Dave Airlie
79e5969172
rip out unneeded back compat code
2006-05-19 04:11:22 +00:00
Dave Airlie
b1a64b8136
add consts to radeon microcode.
...
From: tilman
2006-05-18 07:32:37 +00:00
Eric Anholt
bdd381a7ce
Set entry->virtual for sg maps, fixing ATI PCI/PCIE GART support.
...
PR: kern/97056 Submitted by: Stanislav Sedov <ssedov@mbsd.msk.ru>
2006-05-17 06:07:57 +00:00
Eric Anholt
dcfcf1a84d
Add the bits for vblank support on FreeBSD, which most importantly avoids
...
chasing a NULL pointer at the first 3d app invocation.
2006-05-17 05:44:39 +00:00
Eric Anholt
7ea4a88fa3
Add the workaround that's in the kernel to suppress GCC's warning about
...
refusal to inline functions that (in some cases, at least) aren't that
large.
2006-05-17 05:41:48 +00:00
Dave Airlie
d365f03129
fixup GFP_COMP for older kernels and get_page/put_page for newer
2006-04-23 09:05:05 +00:00
Dave Airlie
30a5787d36
Fix from Benh for ppc r300 scratch
2006-04-23 08:07:57 +00:00
Brian Paul
4a49e6c366
check for __FreeBSD_kernel__ (bug 3810)
2006-04-20 14:26:59 +00:00
Eric Anholt
1327222f9b
Err, use "ifndef" rather than "if !", to avoid compiler warning.
2006-04-18 06:12:22 +00:00
Eric Anholt
2abd1f270b
Reorder the DRM_*_AGP enum to match linux's numbers (oops). Fixes i915
...
attachment. Make our mga_drv.c use them, while I'm here.
Submitted by: Jonathan Fosburgh <jonathan@fosburgh.org>
2006-04-18 06:08:17 +00:00
Eric Anholt
40b70e3244
Use __LP64__ instead of checking the linux-specific BITS_PER_LONG.
2006-04-18 05:57:28 +00:00
Eric Anholt
63c4d02576
Revert a change that accidentally went in with whitespace changes from
...
Linux, which broke on FreeBSD. DRM_COPY_*_IOCTL checks for the size
parameter matching the ioctl's command size there, since the copin/out
happened earlier.
2006-04-09 20:10:32 +00:00
Eric Anholt
6cb366b5a8
Compile fixes for FreeBSD.
2006-04-08 09:45:43 +00:00
Dave Airlie
299aad03c2
coverity bugfix from the kernel
2006-04-05 08:34:24 +00:00