OSDN Git Service
Eric Anholt [Sun, 27 Oct 2002 05:25:50 +0000 (05:25 +0000)]
s/udelay/DRM_UDELAY/
Eric Anholt [Sun, 27 Oct 2002 05:24:33 +0000 (05:24 +0000)]
Catch up to -current.
Alan Hourihane [Tue, 22 Oct 2002 23:38:53 +0000 (23:38 +0000)]
final part of XFree86 4.2.99.2 merge
Alan Hourihane [Tue, 22 Oct 2002 13:43:45 +0000 (13:43 +0000)]
Import of XFree86 4.2.99.2
Eric Anholt [Mon, 14 Oct 2002 23:35:24 +0000 (23:35 +0000)]
Fix reversed test that broke vblank waiting on FreeBSD.
Pointy hat to: anholt
Keith Whitwell [Thu, 10 Oct 2002 08:25:40 +0000 (08:25 +0000)]
Jonny Strom's mga_dma.c patch
Brian Paul [Wed, 9 Oct 2002 16:29:01 +0000 (16:29 +0000)]
replaced max() macro with conditional expression
Keith Whitwell [Tue, 8 Oct 2002 08:32:06 +0000 (08:32 +0000)]
Fix error condition...
Keith Whitwell [Tue, 8 Oct 2002 08:29:47 +0000 (08:29 +0000)]
Call pci_enable_device() in DRM(irq_busid).
Keith Whitwell [Wed, 2 Oct 2002 07:55:27 +0000 (07:55 +0000)]
Free correct block in free_block (K. Rasche)
Michel Daenzer [Tue, 1 Oct 2002 17:31:20 +0000 (17:31 +0000)]
fix wait condition for vertical blank IRQs
Eric Anholt [Sun, 29 Sep 2002 23:56:17 +0000 (23:56 +0000)]
Remove some noise being spit to the console.
Eric Anholt [Sun, 29 Sep 2002 23:21:55 +0000 (23:21 +0000)]
Make our set_bit and friends match linux better (cleans up some warnings)
Eric Anholt [Sun, 29 Sep 2002 22:47:08 +0000 (22:47 +0000)]
warnings cleanup
Eric Anholt [Sun, 29 Sep 2002 22:39:34 +0000 (22:39 +0000)]
Fix some of my silliness in DRM_WAIT_ON (not returning EINTR).
Keith Whitwell [Sun, 29 Sep 2002 21:22:01 +0000 (21:22 +0000)]
Turn boxes off again
Keith Whitwell [Sun, 29 Sep 2002 21:19:01 +0000 (21:19 +0000)]
Move os-dependent stuff out of radeon_irq.c
Eric Anholt [Sun, 29 Sep 2002 20:48:18 +0000 (20:48 +0000)]
Fix up BSD irq handling.
Michel Daenzer [Sun, 29 Sep 2002 00:12:28 +0000 (00:12 +0000)]
add support for 16K and 64K page sizes (Bjorn Helgaas)
Michel Daenzer [Fri, 27 Sep 2002 21:47:52 +0000 (21:47 +0000)]
make SW interrupts more robust: write sequence number to scratch register,
acknowledge any lost interrupts before waiting
Michel Daenzer [Thu, 26 Sep 2002 12:49:18 +0000 (12:49 +0000)]
DRM(vblank_wait) is driver specific
Eric Anholt [Thu, 26 Sep 2002 07:45:07 +0000 (07:45 +0000)]
BSD vblank framework.
Eric Anholt [Thu, 26 Sep 2002 07:21:05 +0000 (07:21 +0000)]
Fix one warning.
Michel Daenzer [Wed, 25 Sep 2002 19:48:51 +0000 (19:48 +0000)]
change RADEON_PARAM_IRQ_ACTIVE to RADEON_PARAM_IRQ_NR
Michel Daenzer [Wed, 25 Sep 2002 17:18:19 +0000 (17:18 +0000)]
common ioctl to wait for vertical blank IRQs
Keith Whitwell [Mon, 23 Sep 2002 17:26:43 +0000 (17:26 +0000)]
merged r200-0-2-branch to trunk
Michel Daenzer [Sat, 21 Sep 2002 23:18:54 +0000 (23:18 +0000)]
make sure we never oops because the hardware lock pointer in the sigdata
structure is out of date
David Dawes [Wed, 11 Sep 2002 00:57:49 +0000 (00:57 +0000)]
- Fix various bugs in the DRI support for the i830 and i845G (Keith
Whitwell).
- Major rework of the 2D i830/i845G support, including:
- Improve VESA mode selection, and fix refresh rate selection.
- Don't duplicate functions provided in the vbe modules.
- Don't duplicate functions provided in the vgahw module.
- Rewrite memory allocation.
- Rewrite initialisation and save/restore state handling.
- Decouple the i810 support from i830 and later.
- Remove various unnecessary hacks and workarounds.
- Fix an 845G problem with the ring buffer not in pre-allocated memory.
- Fix screen blanking.
- Fix some HW cursor glitches, and turn HW cursor off at VT switch and
exit.
- Don't attempt to use the i830's function 1 entity.
- Fix problems with option handling. (David Dawes).
- Add mode VBE-aware mode handling functions to the vbe module (David
Dawes).
Eric Anholt [Fri, 30 Aug 2002 23:49:25 +0000 (23:49 +0000)]
Remove some extra symlinking for kernel module building that hasn't been
needed since 2000.
Eric Anholt [Fri, 30 Aug 2002 21:34:03 +0000 (21:34 +0000)]
Remove this one too: it'll be used from the linux version (if ever)
Eric Anholt [Fri, 30 Aug 2002 21:06:21 +0000 (21:06 +0000)]
Remove compat functions for FreeBSD for drivers which weren't available in
X4.2
Keith Whitwell [Fri, 30 Aug 2002 07:55:25 +0000 (07:55 +0000)]
file radeon_irq.c was initially added on branch r200-0-2-branch.
Keith Whitwell [Thu, 29 Aug 2002 07:34:49 +0000 (07:34 +0000)]
standardize use of __FUNCTION__ (Linus)
Keith Whitwell [Wed, 28 Aug 2002 08:47:39 +0000 (08:47 +0000)]
Turn boxes off.
Eric Anholt [Wed, 28 Aug 2002 04:33:02 +0000 (04:33 +0000)]
Remove i8x0 files from the BSD side. These were not actually ported, and
when they do get ported most of them won't live in these directories.
Keith Whitwell [Tue, 27 Aug 2002 12:16:32 +0000 (12:16 +0000)]
file radeon_mem.c was initially added on branch r200-0-2-branch.
Eric Anholt [Tue, 27 Aug 2002 03:56:10 +0000 (03:56 +0000)]
Remove drm_linux.h, it's no longer used.
Eric Anholt [Tue, 27 Aug 2002 01:22:55 +0000 (01:22 +0000)]
Include non-radeon modules in the build.
Keith Whitwell [Mon, 26 Aug 2002 22:16:18 +0000 (22:16 +0000)]
merged r200-0-1-branch
Leif Delgass [Thu, 22 Aug 2002 19:35:31 +0000 (19:35 +0000)]
Don't (re)define vmalloc_to_page for kernel >= 2.4.19, as it has been
backported from 2.5.x. Also fix a couple of incorrect
LINUX_VERSION_CODE tests and fix header dependency for r128, radeon
when building without AGP.
Leif Delgass [Thu, 22 Aug 2002 18:43:39 +0000 (18:43 +0000)]
SetPageLocked only defined in 2.5.x (x=?), use LockPage for 2.4.x (x>=9).
Also apply build fixes from i810_dma.c to i830_dma.c
Jose Fonseca [Wed, 21 Aug 2002 14:09:28 +0000 (14:09 +0000)]
Change the linux kernel version condition in the i810 driver (according to
Alan Cox)
Eric Anholt [Wed, 21 Aug 2002 07:14:21 +0000 (07:14 +0000)]
Remove drm_linux.h, move the two useful defines into drm_drv.h (the only
place they're used). Use fd locking on -current. Actually copy in data
from userspace to kernel in the linux-compat ioctl path. Make sure
ioctl sizes are as expected in the ioctl handler functions.
Leif Delgass [Wed, 21 Aug 2002 01:14:43 +0000 (01:14 +0000)]
add missing include (for udelay), remove unused counter.
Michel Daenzer [Wed, 21 Aug 2002 00:09:32 +0000 (00:09 +0000)]
TRUE and FALSE don't seem to be defined everywhere...
Keith Whitwell [Mon, 12 Aug 2002 07:26:00 +0000 (07:26 +0000)]
zero-cliprect case patch from Jacek
Michel Daenzer [Sun, 11 Aug 2002 15:56:44 +0000 (15:56 +0000)]
test scratch register writeback before using it
Eric Anholt [Thu, 8 Aug 2002 21:23:46 +0000 (21:23 +0000)]
Try to open the /dev/dri/cardX device once, then only if it fails check the
device number and recreate it if necessary. Fixes xf86drm.c to allow
linux binaries to be used for emulation on FreeBSD.
Rik Faith [Tue, 6 Aug 2002 18:00:57 +0000 (18:00 +0000)]
Updates from Rusty Russell to:
1) Remove redundant header inclusion
2) Silence bitop on non-long argument warnings (change int to long)
3) Move to ISO C (gcc 2.6) initializers (accepted by older gccs also) All
of these are syntax changes that should not impact functionality.
Michel Daenzer [Thu, 18 Jul 2002 23:17:13 +0000 (23:17 +0000)]
fix off-by-one error for right bottom corner in radeon_emit_clip_rect()
(Jacek Rosik)
Tim Smith [Wed, 17 Jul 2002 08:30:36 +0000 (08:30 +0000)]
Workaround for Radeon lockups on fast machines
Michel Daenzer [Sun, 14 Jul 2002 20:26:52 +0000 (20:26 +0000)]
bump DRM minor and check it before using the GETPARAM ioctl to obtain
scratch register values
Michel Daenzer [Thu, 11 Jul 2002 20:31:12 +0000 (20:31 +0000)]
Don't read scratch registers directly, obtain the values via the GET_PARAM
ioctl. The DRM reads them from memory addresses the chip writes to on
updates. Fall back to reading the registers directly with an old DRM.
(Tim Smith, cleanups by myself)
Eric Anholt [Tue, 9 Jul 2002 02:40:38 +0000 (02:40 +0000)]
Increase the linux-compatibility max ioctl.
Alan Hourihane [Sat, 6 Jul 2002 09:43:12 +0000 (09:43 +0000)]
remove obsolete files
Alan Hourihane [Fri, 5 Jul 2002 08:58:15 +0000 (08:58 +0000)]
remove files missed by merge
Alan Hourihane [Fri, 5 Jul 2002 08:31:11 +0000 (08:31 +0000)]
merged bsd-3-0-0-branch
Keith Whitwell [Thu, 4 Jul 2002 12:03:15 +0000 (12:03 +0000)]
Fix some more pageflipping issues -- existing code was doing MMIO writes
while ring was active. There is still an MMIO read in there, but I
haven't seen any lockups that could be attributed to it.
Keith Whitwell [Thu, 4 Jul 2002 11:55:44 +0000 (11:55 +0000)]
Revert SET_SCISSORS change.
Tim Smith [Tue, 2 Jul 2002 21:34:25 +0000 (21:34 +0000)]
Fix lockup on faster machines when drawing in multiple clip rectangles
(e.g. when part of a 3D window is obscured by another window)
Keith Whitwell [Thu, 27 Jun 2002 17:56:39 +0000 (17:56 +0000)]
Set pfCurrentPage on cleanup_pageflip
Alan Hourihane [Tue, 25 Jun 2002 12:13:20 +0000 (12:13 +0000)]
gamma_alloc -> DRM(alloc)
Max Lingua [Tue, 25 Jun 2002 11:20:36 +0000 (11:20 +0000)]
file s3v.h was initially added on branch s3virge-0-0-1-branch.
Max Lingua [Tue, 25 Jun 2002 11:20:36 +0000 (11:20 +0000)]
file s3v_dma.c was initially added on branch s3virge-0-0-1-branch.
Max Lingua [Tue, 25 Jun 2002 11:20:36 +0000 (11:20 +0000)]
file s3v_drm.h was initially added on branch s3virge-0-0-1-branch.
Max Lingua [Tue, 25 Jun 2002 11:20:36 +0000 (11:20 +0000)]
file s3v_drv.c was initially added on branch s3virge-0-0-1-branch.
Max Lingua [Tue, 25 Jun 2002 11:20:36 +0000 (11:20 +0000)]
file s3v_drv.h was initially added on branch s3virge-0-0-1-branch.
Max Lingua [Tue, 25 Jun 2002 11:20:36 +0000 (11:20 +0000)]
file s3v_regs.h was initially added on branch s3virge-0-0-1-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file radeon_state.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file radeon.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file radeon_drm.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga_dma.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga_drv.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga_ucode.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga_warp.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga_state.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file radeon_drv.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file mga_drm.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Fri, 21 Jun 2002 06:08:46 +0000 (06:08 +0000)]
file radeon_cp.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 19 Jun 2002 04:01:55 +0000 (04:01 +0000)]
file r128_state.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 19 Jun 2002 04:01:54 +0000 (04:01 +0000)]
file r128_drv.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 19 Jun 2002 04:01:54 +0000 (04:01 +0000)]
file r128_cce.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 19 Jun 2002 04:01:54 +0000 (04:01 +0000)]
file r128.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 19 Jun 2002 04:01:54 +0000 (04:01 +0000)]
file r128_drm.h was initially added on branch bsd-3-0-0-branch.
Michel Daenzer [Tue, 18 Jun 2002 22:40:26 +0000 (22:40 +0000)]
endianness fixes
Eric Anholt [Mon, 17 Jun 2002 22:18:00 +0000 (22:18 +0000)]
file drm_os_netbsd.h was initially added on branch bsd-3-0-0-branch.
Keith Whitwell [Wed, 12 Jun 2002 15:50:28 +0000 (15:50 +0000)]
merged tcl-0-0-branch
Michel Daenzer [Sun, 2 Jun 2002 16:00:45 +0000 (16:00 +0000)]
fixes for big endian in general and powerpc in particular
Jeff Hartmann [Wed, 29 May 2002 21:21:50 +0000 (21:21 +0000)]
Import Mesa 4.0 port of I830M/I845G 3D driver funded by 2d3d. Import
Lastest i810 ddx driver changes from XFree86 CVS to support the I845G.
Fixup warnings in I830M kernel driver.
-Jeff
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file r128_drv.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file mga_drv.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file tdfx.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file i830_dma.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file i830.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file i830_drv.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file i830_drv.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file i810_drv.h was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file radeon_drv.c was initially added on branch bsd-3-0-0-branch.
Eric Anholt [Wed, 29 May 2002 08:44:52 +0000 (08:44 +0000)]
file i810_dma.c was initially added on branch bsd-3-0-0-branch.