Gareth Hughes [Mon, 2 Apr 2001 01:17:18 +0000 (01:17 +0000)]
Update radeon DRM to v1.1.0 (texture upload changes).
David Dawes [Fri, 30 Mar 2001 17:16:20 +0000 (17:16 +0000)]
- Move xf86ConfigDRI declaration from xf86Priv.h to xf86.h.
- Don't include xf86Priv.h in the drm module.
- Fix 'struct stat' in loader libc wrapping to avoid unnecessary
XFree86LOADER #ifdefs in code that uses it.
- Make drmOpenMinor() static.
Alan Hourihane [Fri, 30 Mar 2001 13:32:39 +0000 (13:32 +0000)]
merge in 2.4.3 kernel change.
David Dawes [Wed, 21 Mar 2001 20:22:16 +0000 (20:22 +0000)]
Move #include <linux/config.h> inside the __linux__ #ifdef, so that it
doesn't break non-Linux builds.
Gareth Hughes [Wed, 21 Mar 2001 13:10:27 +0000 (13:10 +0000)]
- Fix MGA header info.
- Update date strings.
- Fix MGA hangs (undocumented side effects of DWGSYNC).
- Remove idle before ILOAD??? Seems fine with the above fix.
Gareth Hughes [Wed, 21 Mar 2001 03:29:23 +0000 (03:29 +0000)]
Remove compiler warnings, minor cleanups.
David Dawes [Mon, 19 Mar 2001 23:48:35 +0000 (23:48 +0000)]
merge/build fix
David Dawes [Mon, 19 Mar 2001 21:39:36 +0000 (21:39 +0000)]
Initial XFree86 4.0.99.1 merge.
David Dawes [Mon, 19 Mar 2001 17:45:52 +0000 (17:45 +0000)]
Import of XFree86 4.0.99.1
Gareth Hughes [Mon, 19 Mar 2001 12:16:24 +0000 (12:16 +0000)]
Update version, date stamp.
Gareth Hughes [Mon, 19 Mar 2001 12:04:12 +0000 (12:04 +0000)]
Remove PRIMPTR completely.
Gareth Hughes [Mon, 19 Mar 2001 11:49:25 +0000 (11:49 +0000)]
Try this...
Gareth Hughes [Sun, 18 Mar 2001 23:54:41 +0000 (23:54 +0000)]
__REALLY_HAVE_MTRR, vmalloc_32 fixes from Jeff Wiedemeier.
Alan Hourihane [Thu, 15 Mar 2001 21:48:51 +0000 (21:48 +0000)]
file agpgart.diff was initially added on branch gamma-2-0-0-branch.
Kevin E Martin [Wed, 14 Mar 2001 22:22:50 +0000 (22:22 +0000)]
Merged sarea-1-0-0
Gareth Hughes [Tue, 13 Mar 2001 00:22:05 +0000 (00:22 +0000)]
Rest of MGA dualhead patch.
Gareth Hughes [Mon, 12 Mar 2001 18:18:06 +0000 (18:18 +0000)]
Try that again...
Gareth Hughes [Thu, 8 Mar 2001 00:21:33 +0000 (00:21 +0000)]
Fix ring space calculations, tests. Based on patch by Bruce Stockwell.
Gareth Hughes [Wed, 7 Mar 2001 15:06:57 +0000 (15:06 +0000)]
Change error message to debug message when client dies while holding the
lock. Should prevent bug reports about this, but you never know...
Alan Hourihane [Wed, 7 Mar 2001 08:53:15 +0000 (08:53 +0000)]
surround agp calls in drm_memory with __REALLY_HAVE_AGP instead of
CONFIG_... remove include for agpsupport in tdfx_drv.c - not needed.
Gareth Hughes [Tue, 6 Mar 2001 04:37:37 +0000 (04:37 +0000)]
Merge tdfx-3-1-0 branch.
Alan Hourihane [Mon, 5 Mar 2001 16:02:40 +0000 (16:02 +0000)]
allow dristat to find out whether AGP is write-combined or not.
Alan Hourihane [Mon, 5 Mar 2001 15:52:11 +0000 (15:52 +0000)]
fix that last patch to initialize the MTRR when AGP available.
Alan Hourihane [Sun, 4 Mar 2001 19:19:20 +0000 (19:19 +0000)]
Don't try and setup the MTRR for AGP when AGP not available. Check
dev->agp, when agp_acquire called, and..... Uncomment MUST_HAVE_AGP
around agp_* calls, so that support for both agp/pci can happen in a
single kernel driver.
Jeff Hartmann [Wed, 28 Feb 2001 18:47:39 +0000 (18:47 +0000)]
file drm_scatter.h was initially added on branch ati-pcigart-0-0-1-branch.
Gareth Hughes [Wed, 28 Feb 2001 14:11:05 +0000 (14:11 +0000)]
Make the hardware bug workaround configurable. That way, people with newer
revs of the chipset can avoid the copy when it's not needed.
Gareth Hughes [Wed, 28 Feb 2001 11:22:52 +0000 (11:22 +0000)]
Please try this if you experience lockups...
Rik Faith [Wed, 28 Feb 2001 09:27:44 +0000 (09:27 +0000)]
Implement drmOpen* without /proc dependence (Fallback to /proc is included
for backward compatibility.) Move statistic-gathering drm* calls from
dristat.c to xf86drm.c
Rik Faith [Wed, 21 Feb 2001 16:06:10 +0000 (16:06 +0000)]
Add Linux 2.2.x support for stubs
Jeff Hartmann [Wed, 21 Feb 2001 15:48:40 +0000 (15:48 +0000)]
file gamma_drm.h was initially added on branch sarea-1-0-0-branch.
Jeff Hartmann [Tue, 20 Feb 2001 20:16:56 +0000 (20:16 +0000)]
Fix some warnings and flush pixel cache in idle routine so readpixels works
correctly
Gareth Hughes [Tue, 20 Feb 2001 13:44:45 +0000 (13:44 +0000)]
Disable DRIVER_DMA_QUIESCENT() in r128, radeon drivers. Prevents deadlock
in the locking process when the engine isn't idle.
Gareth Hughes [Fri, 16 Feb 2001 05:24:06 +0000 (05:24 +0000)]
- Clean up the way customization of the templates is done.
- Fix old-style DMA for gamma driver (please test).
- Pull out IRQ handling into drm_dma.h (please test on i810, gamma).
- Lots of general cleanups, remove compiler warnings etc.
Keith Whitwell [Thu, 15 Feb 2001 16:31:11 +0000 (16:31 +0000)]
Added missing include "drm_lists.h".
i810 now working fine with new kernel module.
Gareth Hughes [Thu, 15 Feb 2001 10:26:03 +0000 (10:26 +0000)]
- Fix up merge.
- Update date stamps.
Gareth Hughes [Thu, 15 Feb 2001 08:12:14 +0000 (08:12 +0000)]
Merge mga-1-0-0-branch into trunk.
Gareth Hughes [Wed, 14 Feb 2001 14:34:01 +0000 (14:34 +0000)]
file i810.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 14 Feb 2001 06:31:26 +0000 (06:31 +0000)]
file radeon.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 14 Feb 2001 05:30:38 +0000 (05:30 +0000)]
file r128.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 14 Feb 2001 05:30:38 +0000 (05:30 +0000)]
file r128_drm.c was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 14 Feb 2001 01:37:05 +0000 (01:37 +0000)]
file tdfx.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 14 Feb 2001 01:37:05 +0000 (01:37 +0000)]
file tdfx_drm.c was initially added on branch mga-1-0-0-branch.
Alan Hourihane [Tue, 13 Feb 2001 17:53:02 +0000 (17:53 +0000)]
file gamma_context.c was initially added on branch mga-1-0-0-branch.
Alan Hourihane [Fri, 9 Feb 2001 16:44:16 +0000 (16:44 +0000)]
file gamma_drm.c was initially added on branch mga-1-0-0-branch.
Alan Hourihane [Fri, 9 Feb 2001 16:44:16 +0000 (16:44 +0000)]
file gamma.h was initially added on branch mga-1-0-0-branch.
Rik Faith [Fri, 2 Feb 2001 11:44:22 +0000 (11:44 +0000)]
file dristat.c was initially added on branch mga-1-0-0-branch.
Rik Faith [Thu, 1 Feb 2001 20:54:01 +0000 (20:54 +0000)]
file drm_stub.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Mon, 29 Jan 2001 17:46:23 +0000 (17:46 +0000)]
Corresponding sync with PCI GART updates.
Gareth Hughes [Sun, 28 Jan 2001 07:18:08 +0000 (07:18 +0000)]
Fix depth clears properly this time. Update all instances of
drmRadeonClear() to the new interface.
Gareth Hughes [Fri, 26 Jan 2001 07:52:36 +0000 (07:52 +0000)]
Client-side updates for drmRadeonClear(...), fixes color/depth buffer
clears.
Gareth Hughes [Wed, 24 Jan 2001 16:09:02 +0000 (16:09 +0000)]
file mga_warp.c was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:02 +0000 (16:09 +0000)]
file mga_ucode.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:01 +0000 (16:09 +0000)]
file mga_drm.c was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file mga.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_vm.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_lock.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_memory.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_bufs.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_proc.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_fops.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_init.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_ioctl.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_drv.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_context.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_drawable.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_agpsupport.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_auth.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_dma.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 16:09:00 +0000 (16:09 +0000)]
file drm_lists.h was initially added on branch mga-1-0-0-branch.
Gareth Hughes [Wed, 24 Jan 2001 15:34:46 +0000 (15:34 +0000)]
- Misc cleanups.
- Fix drmR128Clear parameters (Radeon to follow).
- Add some helper macros to r128/radeon kernel modules.
Jeff Hartmann [Tue, 23 Jan 2001 17:53:57 +0000 (17:53 +0000)]
file ati_pcigart.h was initially added on branch ati-pcigart-0-0-1-branch.
Jeff Hartmann [Tue, 23 Jan 2001 17:53:57 +0000 (17:53 +0000)]
file ati_pcigart.c was initially added on branch ati-pcigart-0-0-1-branch.
Jeff Hartmann [Thu, 18 Jan 2001 18:21:05 +0000 (18:21 +0000)]
Fixed problem preventing compile on system w/o agpgart.
Jeff Hartmann [Wed, 17 Jan 2001 18:43:04 +0000 (18:43 +0000)]
file r128_pcigart.c was initially added on branch ati-pcigart-0-0-1-branch.
Jeff Hartmann [Wed, 17 Jan 2001 18:43:04 +0000 (18:43 +0000)]
file scatter.c was initially added on branch ati-pcigart-0-0-1-branch.
Gareth Hughes [Sat, 13 Jan 2001 01:33:00 +0000 (01:33 +0000)]
Remove debug messages.
Keith Whitwell [Thu, 11 Jan 2001 20:05:39 +0000 (20:05 +0000)]
Makefile.linux was checking $(MACHINE) for 'i386' before building the
i810.o module. However on my i810's, $(MACHINE) is 'i686'.
Nathan Hand [Mon, 8 Jan 2001 16:21:42 +0000 (16:21 +0000)]
Merged tdfx-3-0-0
Kevin E Martin [Fri, 5 Jan 2001 22:57:55 +0000 (22:57 +0000)]
Merged ati-5-0-0
Rik Faith [Thu, 4 Jan 2001 18:41:41 +0000 (18:41 +0000)]
Sync with Linux 2.4.0-prerelease
Keith Whitwell [Sat, 30 Dec 2000 23:28:53 +0000 (23:28 +0000)]
add blit ioctl, fix plnwt handling
Gareth Hughes [Fri, 15 Dec 2000 01:15:57 +0000 (01:15 +0000)]
Update date information.
Gareth Hughes [Wed, 13 Dec 2000 10:30:26 +0000 (10:30 +0000)]
file bufs_tmp.h was initially added on branch mach64-0-0-1-branch.
Gareth Hughes [Tue, 12 Dec 2000 14:50:50 +0000 (14:50 +0000)]
- Fix nasty depth span bug. Drawable offset was not being added to pixel
coords.
- Remove unneeded mask parameters from clear ioctl.
- Use correct subpixel offsets, fixes most glean bugs.
- Remove 32-bit depth buffer support. Only use 16 or 24-bit depth buffers.
David Dawes [Tue, 5 Dec 2000 16:39:28 +0000 (16:39 +0000)]
Import of XFree86 4.0.1g
Gareth Hughes [Mon, 4 Dec 2000 06:26:37 +0000 (06:26 +0000)]
file mach64_dma.c was initially added on branch mach64-0-0-1-branch.
Gareth Hughes [Mon, 4 Dec 2000 06:26:37 +0000 (06:26 +0000)]
file mach64_state.c was initially added on branch mach64-0-0-1-branch.
Gareth Hughes [Sat, 2 Dec 2000 13:10:03 +0000 (13:10 +0000)]
file mach64_drm.h was initially added on branch mach64-0-0-1-branch.
Gareth Hughes [Sat, 2 Dec 2000 06:14:18 +0000 (06:14 +0000)]
Merged ati-4-1-1-branch into trunk.
David Dawes [Thu, 30 Nov 2000 17:32:23 +0000 (17:32 +0000)]
Import of XFree86 4.0.1f
Gareth Hughes [Mon, 27 Nov 2000 15:30:26 +0000 (15:30 +0000)]
file context_tmp.h was initially added on branch mach64-0-0-1-branch.
Gareth Hughes [Mon, 27 Nov 2000 15:30:26 +0000 (15:30 +0000)]
file driver_tmp.h was initially added on branch mach64-0-0-1-branch.
Gareth Hughes [Mon, 27 Nov 2000 15:30:26 +0000 (15:30 +0000)]
file mach64_drv.h was initially added on branch mach64-0-0-1-branch.
Jeff Hartmann [Tue, 21 Nov 2000 16:18:47 +0000 (16:18 +0000)]
Integrated bug fix from David S. Miller (a wait queue removal bug)
Rik Faith [Wed, 15 Nov 2000 15:47:51 +0000 (15:47 +0000)]
Sync with Linux 2.4.0-test11-pre5 Provide backward compatibility tested
against 2.2.18pre21
As usual, since all 2.4.0-test* kernels set LINUX_VERSION_CODE to the same
value, if you are running a 2.4.0-test kernel, you MUST be running
2.4.0-test11-pre4 or later (although anything after 2.4.0-test11-pre1
should work fine -- I tested with pre4/pre5). I expect 2.2.x support to
continue to work for all recent kernels, but I tested with 2.2.18pre21
-- we use the old intermodule symbol communication for 2.2.x kernels,
so they should all continue to work.
Rik Faith [Tue, 14 Nov 2000 21:35:00 +0000 (21:35 +0000)]
Move .c to .h file
Kevin E Martin [Mon, 13 Nov 2000 23:35:02 +0000 (23:35 +0000)]
file radeon_state.c was initially added on branch ati-5-0-0-branch.
Kevin E Martin [Mon, 13 Nov 2000 23:35:02 +0000 (23:35 +0000)]
file radeon_cp.c was initially added on branch ati-5-0-0-branch.
Rik Faith [Fri, 10 Nov 2000 18:27:33 +0000 (18:27 +0000)]
Split agpsupport.c into pre-2.4.0 version and current version.
David Dawes [Wed, 8 Nov 2000 00:07:17 +0000 (00:07 +0000)]
merge with 4.0.1d