OSDN Git Service
Jeff Hartmann [Fri, 10 Aug 2001 16:29:21 +0000 (16:29 +0000)]
Commit Keith Owens kernel Makefile changes, merge and commit alpha patch
set from Jay Estabrook (sans some mga modifications which broke other
arch's.)
Jeff Hartmann [Wed, 8 Aug 2001 16:10:47 +0000 (16:10 +0000)]
Update to the code I sent Linus and Alan this morning. Added some missing
agp chipsets to drm_agpsupport.h, redid the card detection common code
to use a structure (avoids endian porting issues), changed the tdfx
driver to use the kernel pci id '#defines'
Jeff Hartmann [Tue, 7 Aug 2001 18:22:41 +0000 (18:22 +0000)]
Avoid compiler warning about r_list being used uninitialized.
Jeff Hartmann [Tue, 7 Aug 2001 18:15:10 +0000 (18:15 +0000)]
Lots of DRM fixes: added new pieces of template code so the ffb driver can
be ported, rolled back r128 and i810 version bumps so 4.1.0 works with
cvs kernel modules, added Config.in and updated Makefile.kernel,
incorporated lots of drm fixes inspired by patches sent by Redhat, made
DRM(realloc) usage check for NULL allocations, restructure driver init
routines to export dev_priv only when initialized and to check for all
error conditions.
David Dawes [Mon, 30 Jul 2001 19:59:39 +0000 (19:59 +0000)]
Merge the multihead-1-0-0 branch into the trunk, with the exception of the
glide header files.
The changes include:
- Brian Paul's changes to the tdfx client-side 3D driver to make it
dlopen() the correct glide library (Voodoo3 or Voodoo5). This allows
both types of the glide library to co-exist, and allows Voodoo3/Voodoo5
cards to be mixed in multi-head configs.
- DRM kernel driver changes to allow a driver to set up multiple instances
(minor numbers), one for each card present that the driver supports.
This is currently implemented and tested only for the tdfx DRM driver.
- Add some missing missing <stdarg.h> includes.
- Some log message cleanups.
- Change the 2D tdfx driver to access VGA legacy registers via their PCI
I/O space access points rather than their legacy addresses, and fix
some problems with the way the VGA-related bits are initialised.
Status:
- With these changes, multi-head direct rendering works with multiple
Voodoo3 and/or Voodoo5 cards. This has been tested with two PCI Voodoo3
cards and an AGP Voodoo5 card, and all permutations of those.
Caveats:
- Xinerama is not supported. If Xinerama is enabled, then direct rendering
gets disabled.
- The text mode on secondary screens will show junk after the X server
exits.
- On some hardware, starting the X server on multiple 3dfx cards will
result in a hard lockup. One workaround is to enable APIC support in a
uni-processor kernel, or use an SMP kernel.
Jeff Hartmann [Mon, 23 Jul 2001 20:25:38 +0000 (20:25 +0000)]
Fixes that allow the modules to be built into the kernel
Jeff Hartmann [Fri, 20 Jul 2001 22:16:04 +0000 (22:16 +0000)]
Merge checker fixes from Alan Cox made to the drm in the ac kernel tree.
These aren't really security problems, but Alan has made some arguments
that have convinced me that the code should be fixed anyway.
Jeff Hartmann [Fri, 20 Jul 2001 20:31:30 +0000 (20:31 +0000)]
Remove module name hacks because we aren't going to implement this anymore
because of Linus' comments
Jeff Hartmann [Wed, 18 Jul 2001 21:02:58 +0000 (21:02 +0000)]
Add module version name at a lower layer of the code, allows things to be
more flexible and allow older module versions to still work. Might not
be final code if we move over to DRI kernel module version, but will be
if we use XFree86 version. + Only build tdfx.o instead of tdfx-4_1_0.o
since tdfx.o has never changed its API.
Jeff Hartmann [Tue, 17 Jul 2001 22:31:26 +0000 (22:31 +0000)]
Someone forgot to bump the r128 and i810 drivers properly before the 4.1.0
release. Better late than never.
Jeff Hartmann [Mon, 16 Jul 2001 22:42:36 +0000 (22:42 +0000)]
Added version string to the end of the kernel module name. This allows
multiple versions of the kernel module to co-exist on one machine.
Jeff Hartmann [Mon, 16 Jul 2001 16:57:12 +0000 (16:57 +0000)]
i810 drm security fix
Gareth Hughes [Fri, 13 Jul 2001 01:42:48 +0000 (01:42 +0000)]
Fix typo in XFREE86_VERSION().
Jeff Hartmann [Mon, 18 Jun 2001 19:25:15 +0000 (19:25 +0000)]
Fix 5 security bugs found by the Stanford tools
Gareth Hughes [Mon, 18 Jun 2001 13:45:23 +0000 (13:45 +0000)]
Forgot to bump date stamp.
Gareth Hughes [Mon, 18 Jun 2001 12:59:42 +0000 (12:59 +0000)]
Enable shared IRQs in DMA template, use in i810 driver.
David Dawes [Thu, 14 Jun 2001 22:23:44 +0000 (22:23 +0000)]
First pass of 4.1.0 merge.
David Dawes [Thu, 14 Jun 2001 21:53:06 +0000 (21:53 +0000)]
Import of XFree86 4.1.0
Gareth Hughes [Wed, 23 May 2001 17:41:31 +0000 (17:41 +0000)]
Only authenticated clients can mmap() (Jeff Hartmann).
Alan Hourihane [Thu, 17 May 2001 15:20:40 +0000 (15:20 +0000)]
Make the SiS module work again. At least glxinfo reports it's working, yet
trying to run the simple apps return 'out of video memory'
David Dawes [Mon, 14 May 2001 14:49:58 +0000 (14:49 +0000)]
finish struct stat type cleanup Fix a build dependencies for the tdfx drm
module
Alan Hourihane [Fri, 4 May 2001 14:05:13 +0000 (14:05 +0000)]
add some commented enclosures around the BUS_BASE calls for Alpha
platforms.
Alan Hourihane [Fri, 4 May 2001 09:31:35 +0000 (09:31 +0000)]
file drm_linux.h was initially added on branch bsd-2-0-0-branch.
Alan Hourihane [Fri, 4 May 2001 08:28:30 +0000 (08:28 +0000)]
file drm_agpsupport.h was initially added on branch bsd-2-0-0-branch.
Alan Hourihane [Thu, 3 May 2001 14:52:29 +0000 (14:52 +0000)]
add new file
Alan Hourihane [Thu, 3 May 2001 14:51:01 +0000 (14:51 +0000)]
Make SiS driver compile with the new templated format. Not tested. minor
cleanups
Alan Hourihane [Thu, 3 May 2001 14:32:59 +0000 (14:32 +0000)]
remove deprecated file
David Dawes [Tue, 1 May 2001 21:39:35 +0000 (21:39 +0000)]
Initial merge for XFree86 4.0.99.3 import
David Dawes [Tue, 1 May 2001 17:07:59 +0000 (17:07 +0000)]
Import of XFree86 4.0.99.3
Alan Hourihane [Mon, 30 Apr 2001 16:18:22 +0000 (16:18 +0000)]
fix build of i810 kernel driver for 2.4.3 or greater kernels
Kevin E Martin [Mon, 30 Apr 2001 15:07:18 +0000 (15:07 +0000)]
- PCIGART patches for Alpha from Compaq
Alan Hourihane [Mon, 30 Apr 2001 13:24:28 +0000 (13:24 +0000)]
file drm_vm.h was initially added on branch bsd-2-0-0-branch.
Alan Hourihane [Mon, 30 Apr 2001 11:11:00 +0000 (11:11 +0000)]
file drm_sysctl.h was initially added on branch bsd-2-0-0-branch.
Alan Hourihane [Wed, 25 Apr 2001 14:20:17 +0000 (14:20 +0000)]
file drm_os_freebsd.h was initially added on branch bsd-2-0-0-branch.
Alan Hourihane [Wed, 25 Apr 2001 14:20:17 +0000 (14:20 +0000)]
file drm_os_linux.h was initially added on branch bsd-2-0-0-branch.
Alan Hourihane [Wed, 25 Apr 2001 12:59:04 +0000 (12:59 +0000)]
file Makefile was initially added on branch bsd-2-0-0-branch.
Brian Paul [Sat, 21 Apr 2001 19:06:46 +0000 (19:06 +0000)]
include linux/sisfb.h, per David Gaarenstroom
David Dawes [Wed, 18 Apr 2001 18:45:20 +0000 (18:45 +0000)]
put back BUS_BASE
Kevin E Martin [Mon, 16 Apr 2001 21:43:28 +0000 (21:43 +0000)]
- Fix typo and remove magic numbers
David Dawes [Tue, 10 Apr 2001 18:45:17 +0000 (18:45 +0000)]
Use the linux version of xf86drm.c.
David Dawes [Mon, 9 Apr 2001 21:56:31 +0000 (21:56 +0000)]
First pass of XFree86 4.0.99.2 merge.
David Dawes [Mon, 9 Apr 2001 16:27:54 +0000 (16:27 +0000)]
Import -f XFree86 4.0.99.2
Kevin E Martin [Fri, 6 Apr 2001 17:53:32 +0000 (17:53 +0000)]
- Fix typo
- Clean up some macros
Alan Hourihane [Fri, 6 Apr 2001 15:49:42 +0000 (15:49 +0000)]
search /lib/modules/<version>/build/include first, then the others....
Alan Hourihane [Fri, 6 Apr 2001 08:39:02 +0000 (08:39 +0000)]
Handle drivers that don't have __HAVE_SG defined.
Kevin E Martin [Thu, 5 Apr 2001 22:16:12 +0000 (22:16 +0000)]
Merged ati-pcigart-1-0-0
Alan Hourihane [Tue, 3 Apr 2001 08:01:00 +0000 (08:01 +0000)]
include 2.4.2
Alan Hourihane [Tue, 3 Apr 2001 07:50:30 +0000 (07:50 +0000)]
make 2.4.2 -> 2.4.3 change conditional. works with older than 2.4.3 kernels
again.
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.