Michel Daenzer
7e39628577
Have CVS ignore some files produced by the build.
2004-04-10 16:20:00 +00:00
Dave Airlie
3306abbde7
white space changes to align with kernel
2004-04-10 13:52:43 +00:00
Dave Airlie
7e0f883501
include highmem.h
2004-04-10 13:25:30 +00:00
Dave Airlie
2b0292c739
update gamma_dma with patch from davej in 2.6
2004-04-10 12:58:18 +00:00
Dave Airlie
e375a3dc10
patch from Andrew Morton tree from Arjan van de Ven fixes some oopses seen
...
with 4G/4G split
2004-04-10 08:15:48 +00:00
Dave Airlie
23ec8875fc
align code with Linux kernel.
2004-04-10 07:41:19 +00:00
Dave Airlie
6aad146173
remove unused code
2004-04-10 07:39:00 +00:00
Dave Airlie
fd47335798
update from linux kernel for ia64
2004-04-10 07:36:30 +00:00
Alan Hourihane
f673c9280c
remove Imakefile
2004-04-09 00:21:43 +00:00
Alan Hourihane
596cf634ae
fix build problem
2004-04-08 23:22:05 +00:00
Alan Hourihane
ce601f3647
disable PCI DMA ioctls as they are not used currently until SAVAGE_CMD_DMA
...
is made to work.
2004-04-08 23:19:15 +00:00
Dave Airlie
c47597b484
big whitespace .. this aligns all the whitespace in this file with the bk
...
checkout linux tree
2004-04-08 14:15:36 +00:00
Dave Airlie
13724f032e
2.6 sysfs patches + stubs in drmP.h for 2.4 compatibility
2004-04-08 13:11:04 +00:00
Dave Airlie
c3e2685e82
long dev_t patches from 2.6 tree
2004-04-08 12:25:31 +00:00
Dave Airlie
9cff4b45e7
2.6 patches for larger dev_t
2004-04-08 12:22:22 +00:00
Dave Airlie
3e0f3c1fbb
more 2.4 compat fns
2004-04-08 12:20:39 +00:00
Dave Airlie
1bc7576474
patch from Linux kernel 2.6.5
2004-04-08 12:09:10 +00:00
Dave Airlie
bc1428035c
fixes from Linux kernel
2004-04-08 12:05:25 +00:00
Dave Airlie
ee2889ec0d
patch from lk
2004-04-08 11:26:52 +00:00
Thomas Hellstrom
994fa063cd
VIA module fixes:
...
1. Fixed up PCI-id's.
2. Fixed 2.6 warning in kernel Makefile.
2004-03-31 22:05:57 +00:00
Dave Airlie
20163c2b10
copy correct Makefile
2004-03-26 15:52:11 +00:00
Thomas Hellstrom
9b7bf9127e
Added via driver to drm/linux/Config.in Reported by: Terry Barnaby
2004-03-26 13:42:48 +00:00
Thomas Hellstrom
1da595d797
Exported symbols cause compilation failure of via_mm.c on 2.4 kernels.
...
Added via_mm.o to export-objs:
Reported by: HMX, Via Arena Forum
2004-03-24 23:22:22 +00:00
Thomas Hellstrom
b15deb2392
Modified linux/Kconfig to include the via drm driver.
2004-03-24 10:07:37 +00:00
Thomas Hellstrom
89d67d9087
Merged via-1-2-0: Altered Makefiles in drm/linux
2004-03-23 21:14:17 +00:00
Thomas Hellstrom
6cd8831f7a
Merged via-1-2-0
2004-03-23 21:08:48 +00:00
Dave Airlie
681da75af9
make sure in DRM toplevel
2004-03-23 11:17:03 +00:00
Dave Airlie
dfc71cbd42
initial shell script to create linux kernel drm from the DRI one
2004-03-23 11:06:47 +00:00
Jon Smirl
ab66cbc1c5
Adjust shared path in makefile XFree86 bug: Reported by: Submitted by:
...
Reviewed by: Obtained from:
2004-03-17 01:03:26 +00:00
Jon Smirl
537ac1a39e
Makefile the makefile really clean everything XFree86 bug: Reported by:
...
Submitted by: Reviewed by: Obtained from:
2004-03-16 00:59:24 +00:00
Jon Smirl
0b6f155dbd
Add a missing ifdef CTX to get rid of the waring in the gamma driver build.
...
XFree86 bug: Reported by: Submitted by: Reviewed by: Obtained from:
2004-03-16 00:52:24 +00:00
Jon Smirl
24115068e4
Fixes need to clean up the mess I made with the mesa merge. This code
...
allows the mesa drivers to use a single definition of the DRM
sarea/IOCTLS located in the drm driver directory. Adjustments were made
to the 2D drivers to not include these changes. Changes to the mesa
copy of DRM were copied to the DRI copy. XFree86 bug: Reported by:
Submitted by: Reviewed by: Obtained from:
2004-03-12 21:22:52 +00:00
Michel Daenzer
f47ed99143
Remove extraneous code accidentally added with revision 1.86
2004-02-28 14:29:44 +00:00
Michel Daenzer
b61f07def3
More differentiated error codes for DRM(agp_acquire)
...
Obtained from: Linux kernel
2004-02-28 11:52:19 +00:00
Felix Kuehling
ce21dca4aa
Use DO_MUNMAP_4_ARGS macro defined in Makefile.linux (Steve Holland).
...
Silence a warning about a format-argument mismatch in printk.
2004-02-24 14:24:07 +00:00
Felix Kuehling
3dea36d843
Merged the Savage DRM driver from the savage-2-0-0-branch into the trunk.
2004-02-22 16:20:16 +00:00
Felix Kuehling
d0031f22cf
Conditionally add definition of list_for_each_entry_safe for kernel
...
versions that don't have it.
2004-02-21 19:54:51 +00:00
Keith Whitwell
82157579b5
drm_ctx_dtor.patch Submitted by: Erdi Chen
2004-02-20 22:55:12 +00:00
Michel Daenzer
213247a441
Fix sisfb header location for 2.6 kernels
...
Submitted by: Andrew Morton
2004-02-18 20:56:58 +00:00
Michel Daenzer
2b9c12ef83
Adapt to nopage() prototype change in Linux 2.6.1.
...
Reviewed by: Arjan van de Ven <arjanv@redhat.com>, additional feedback from
William Lee Irwin III and Linus Torvalds.
2004-01-11 00:14:28 +00:00
Michel Daenzer
0dea4de288
Make sure that all state packets are handled in
...
radeon_check_and_fixup_packets()
Fix state packet IDs of R200 cubic offsets
2004-01-10 20:59:16 +00:00
Michel Daenzer
7b62ed9aed
R200_PP_CUBIC_OFFSET_F1_[0-6] state packets only contain 5 offsets, not 6
...
(thanks to Andreas Stenglein for spotting this)
2004-01-10 12:28:06 +00:00
Eric Anholt
fb7b802dda
Fix some misuse of NULL where 0 is intended.
...
Obtained from: FreeBSD CVS
2004-01-06 04:54:25 +00:00
Eric Anholt
9fb6986e83
Don't ioremap the framebuffer area. The ioremapped area wasn't used by
...
anything, and took up valuable KVA. While I'm in the area, clean up BSD
MTRR stuff some more.
Suggested by: jonsmirl
2003-12-16 08:57:08 +00:00
Eric Anholt
5285b02987
Add a collection of Radeon and R128 PCI IDs, including the IGP chipsets.
...
Submitted by: Donnie Berkholz <spyderous@gentoo.org> (mostly)
2003-12-16 07:39:43 +00:00
Keith Whitwell
64006ef86b
Add i865 pci id
2003-12-08 16:33:08 +00:00
Eric Anholt
6e56c39371
Fix a locking nit, and add asserts in some things that should be called
...
with locks held.
2003-11-12 20:30:51 +00:00
Eric Anholt
1f7598245a
Return EBUSY when attempting to addmap a DRM_SHM area with a lock in it if
...
dev->lock.hw_lock is already set. This fixes the case of two X Servers
running on the same head on different VTs with interface 1.1, by making
the 2nd head fail to inizialize like before.
2003-11-06 04:48:06 +00:00
Eric Anholt
2c1172a317
Remove unused variable.
2003-11-06 04:35:08 +00:00
Alan Hourihane
a41a479f74
Changes to DRM(irq_install)...... wrap dev->dma usage with __HAVE_DMA in
...
irq handler, fixes kernel ooops. comment out some setting of flags that
are done in DRM(setup) (not sure why both of the above is done in the
irq handler)
2003-11-05 20:47:28 +00:00