85c16d962d
resolve merge conflicts
2003-09-12 14:24:17 +00:00
6fc41e25e5
Use spldrm/splx around tsleep() in DRM_WAIT_ON
2003-09-09 07:45:12 +00:00
4d6d357202
Correct format in debug printfs (free is a pointer, not an int).
2003-09-07 23:56:20 +00:00
6f563cd513
Fix for older -stable.
...
Obtained from: FreeBSD CVS
2003-09-07 23:27:04 +00:00
ebca51d8da
Update to reflect renaming of SIS ioctls.
2003-08-29 21:41:32 +00:00
f634f68759
These files were missed in the SiS DRM commit.
2003-08-29 20:54:26 +00:00
fabc64dd57
Port the SiS DRM to FreeBSD. This includes the ability for the DRM to
...
allocate framebuffer memory without sisfb, and a new ioctl to be used
by the X Server which tells the DRM what region of framebuffer memory
to allocate from. Also fixes a possibility to panic the kernel I
believe. Tested on linux with sisfb and FreeBSD (without sisfb) with
new DRI only.
2003-08-29 19:24:36 +00:00
a7aebb6dac
Add DRM(calloc), which is convenient, used by the new sis code, and takes
...
advantage of M_ZERO on BSDs.
2003-08-29 19:16:13 +00:00
db78129116
Update radeon PCI IDs.
2003-08-29 19:08:06 +00:00
bd3bc9f23d
This PCI header has been living in dev/pci/ for a while now.
2003-08-29 19:07:27 +00:00
ba804e7864
Remove superfluous TLB flush
2003-08-28 12:14:17 +00:00
b83d2f909e
Rename agp to gart for radeon
2003-08-26 16:49:33 +00:00
062751ac47
Remove artificial PCI GART limitations, rename AGP to GART where
...
appropriate
2003-08-26 15:44:01 +00:00
963ad33cb6
Fix the debug build.
2003-08-19 02:22:57 +00:00
ad78a613a4
- Remove $FreeBSD$ tags as they weren't too useful and merges are now being
...
done through perforce.
- Add copyright headers to drm_os_*bsd.h, still need to research the other
copyright-less files better.
2003-08-19 00:41:00 +00:00
07a9b30082
Clean up Radeon DRI resume code
2003-08-18 23:46:19 +00:00
0f094c33da
Make r128_do_wait_for_idle static, as it's only used in this file.
...
Noticed by: CScout
2003-08-18 23:42:16 +00:00
6298d1a1e0
Remove an unnecessary #define __NO_VERSION__
...
Noticed by: CScout
2003-08-18 23:41:05 +00:00
9d7b01ebbe
Merge from 2.6 kernel (Linus Torvalds)
2003-08-15 10:31:54 +00:00
a073ff7dc7
DA: loads of whitespace .. some from Linus, some from me
2003-08-15 01:05:24 +00:00
428cbe0b91
DA: patch from Matthew upgraded to latest DRI head to solve issue with i810
...
compatibility
2003-08-13 23:35:40 +00:00
03e6674c13
Whitespace cleanup from the pageflipping commit.
2003-08-12 21:48:16 +00:00
4c9daf6847
Document change in interface version 1.9.
2003-08-12 21:47:34 +00:00
fbdadde007
Document the changes in interface version 2.5.
2003-08-12 21:34:03 +00:00
02675a470e
Merge from FreeBSD r1.11: We have memset in the kernel, no need to define
...
it to bzero (which it was always used for).
2003-08-12 21:18:05 +00:00
447d8c56bb
DA: code cleanups for i810_dma.c from 2.4 kernel
2003-08-11 01:46:02 +00:00
c99acb597f
Added some information as to when (which DRM version) various queries were
...
added.
2003-08-08 21:06:44 +00:00
e7944efc45
build fix for kernels >= 2.6
2003-08-07 10:13:50 +00:00
da16867c84
Fix maplist entries being used after they were freed; thanks to Benjamin
...
Herrenschmidt for tracking this down
2003-08-06 11:46:21 +00:00
4b60cae90e
IRQ code cleanup suggested by Linus Torvalds
...
i830 build fix
2003-07-29 10:11:48 +00:00
c26ffeafca
Degrade uninformative error message to debug message, as in other drivers
2003-07-26 15:59:09 +00:00
aaf2105be9
Add Rage 128 pageflipping support, defaults to off. DRM version bump to
...
2.5.0. It still has some issues, including a flicker in the fps meter
in tuxracer and I've seen garbage left behind after moving/closing
windows. However, it's usable. Add the Option "EnablePageFlip" "YES" to
use it.
2003-07-26 03:25:40 +00:00
983db58a26
Fix FreeBSD build after IRQ changes.
2003-07-26 03:18:34 +00:00
bef7017749
Compile fixes for recent 2.5/2.6 Linux kernels. I hope this doesn't break
...
the i830 driver or the BSDs. :)
2003-07-25 10:50:39 +00:00
32ef0f59a8
Fail in DRM(agp_acquire) if the AGP aperture can't be used, such that the X
...
server falls back to PCI GART or disables the DRI gracefully
2003-07-25 10:31:37 +00:00
3669639b21
Restore __HAVE_KERNEL_CTX_SWITCH, required for the sparc drm module in the
...
kernel tree. Added comments to that effect.
2003-07-11 15:27:55 +00:00
1654bc5752
DA: fix for bug 484 in Bugzilla, originally from me, reworked by David
...
Dawes to avoid backword incompatibilities...
2003-07-09 23:21:15 +00:00
f4188a7518
file drm_mem.h was initially added on branch newdrm-0-0-1-branch.
2003-07-09 09:28:42 +00:00
7dc959ed21
file drm_dma.c was initially added on branch newdrm-0-0-1-branch.
2003-07-09 09:26:17 +00:00
49d152544e
file drm_fops.c was initially added on branch newdrm-0-0-1-branch.
2003-07-09 09:26:17 +00:00
6a0e485457
file drm_lock.c was initially added on branch newdrm-0-0-1-branch.
2003-07-09 09:26:17 +00:00
c7f9545482
file drm_stub.c was initially added on branch newdrm-0-0-1-branch.
2003-07-09 09:26:17 +00:00
cf6e7980c9
file drm_vm.c was initially added on branch newdrm-0-0-1-branch.
2003-07-09 09:26:17 +00:00
2daf147652
Removed unused __HAVE_KERNEL_CTX_SWITCH, whatever that was.
2003-07-08 17:10:13 +00:00
39e1c534c0
Don't need to include linux/wrapper.h - we only use Set/ClearPageReserved
...
from linux/mm.h now and wrapper.h has been removed in 2.5.69 and later.
2003-07-04 18:31:42 +00:00
01d6ae90d6
file drm_agp.c was initially added on branch newdrm-0-0-1-branch.
2003-07-01 18:56:57 +00:00
a145363ee1
file drm_bufs.c was initially added on branch newdrm-0-0-1-branch.
2003-07-01 18:56:57 +00:00
7c565e4961
file drm_mem.c was initially added on branch newdrm-0-0-1-branch.
2003-07-01 18:56:57 +00:00
43d3934ac8
file drm_pci.c was initially added on branch newdrm-0-0-1-branch.
2003-07-01 18:56:57 +00:00
8ec900afb4
file drm_sg.c was initially added on branch newdrm-0-0-1-branch.
2003-07-01 18:56:57 +00:00
Alan Hourihane
Keith Whitwell
Eric Anholt
Michel Daenzer
Dave Airlie
Ian Romanick
Jose Fonseca
Leif Delgass