OSDN Git Service
Ian Romanick [Tue, 1 Jun 2004 16:17:32 +0000 (16:17 +0000)]
Replace size_t with an ugly, ugly hack. This was done so that code in the
core X-server would compile. Hopefully, this will soon be replaced with
explicitly sized types (i.e., uint32_t) and everyone will be happy.
Dave Airlie [Sun, 30 May 2004 23:38:08 +0000 (23:38 +0000)]
2.4 compat
Dave Airlie [Sun, 30 May 2004 23:34:23 +0000 (23:34 +0000)]
fixes from kernel: Make users of page->count use the provided macros
Roland Scheidegger [Tue, 18 May 2004 23:30:46 +0000 (23:30 +0000)]
fix whitespace issue in previous patch
Roland Scheidegger [Tue, 18 May 2004 23:03:22 +0000 (23:03 +0000)]
add R200_EMIT_RB3D_BLENDCOLOR state packet to support GL_EXT_blend_color,
GL_EXT_blend_func_separate and GL_EXT_blend_equation_separate on r200
Dave Airlie [Tue, 18 May 2004 09:46:31 +0000 (09:46 +0000)]
another 2.4 fix
Dave Airlie [Tue, 18 May 2004 09:42:22 +0000 (09:42 +0000)]
2.4 compat fix
Erdi Chen [Fri, 14 May 2004 23:54:31 +0000 (23:54 +0000)]
Add PCI id entry for VIA CN400 (UnichromePro) chip. XFree86 bug: Reported
by: Submitted by: Reviewed by: Obtained from:
Eric Anholt [Tue, 11 May 2004 04:43:43 +0000 (04:43 +0000)]
Merge from FreeBSD-current. Mostly 64-bit cleanliness fixes, but a few
driver interface changes from -current.
Eric Anholt [Tue, 11 May 2004 04:23:02 +0000 (04:23 +0000)]
Add missing DRM_ERR()s.
Dave Airlie [Mon, 10 May 2004 11:16:26 +0000 (11:16 +0000)]
do some real testing and fix the DRM initialising and unloading
Eric Anholt [Sun, 9 May 2004 22:36:19 +0000 (22:36 +0000)]
Add mach64 DRM module for BSD (untested, but compiles).
Eric Anholt [Sun, 9 May 2004 22:29:55 +0000 (22:29 +0000)]
Add .cvsignore files.
Eric Anholt [Sun, 9 May 2004 22:16:11 +0000 (22:16 +0000)]
Warning fixes.
Eric Anholt [Sun, 9 May 2004 22:14:07 +0000 (22:14 +0000)]
- Link in shared files as necessary and clean them up.
- Generate drm_pciids.h automatically.
Eric Anholt [Sun, 9 May 2004 22:07:58 +0000 (22:07 +0000)]
Catch up with sis's DRM tag change.
Eric Anholt [Sun, 9 May 2004 21:59:36 +0000 (21:59 +0000)]
Remove after repocopy to Makefile, now that we don't have to worry about
conflicting with imake's output.
Eric Anholt [Sun, 9 May 2004 21:57:58 +0000 (21:57 +0000)]
No /bin/bash on BSD.
Eric Anholt [Sun, 9 May 2004 21:56:19 +0000 (21:56 +0000)]
drm_hw_lock_t is now defined in drm.h, remove from here.
Dave Airlie [Sun, 9 May 2004 06:45:17 +0000 (06:45 +0000)]
Commit sysfs and drm PCI changes for 2.6 kernel
Dave Airlie [Sun, 9 May 2004 06:36:55 +0000 (06:36 +0000)]
make drm pciids
Dave Airlie [Mon, 3 May 2004 00:06:04 +0000 (00:06 +0000)]
use drm.. not dri for class...
Dave Airlie [Sun, 2 May 2004 13:03:51 +0000 (13:03 +0000)]
fix 2.4 build
Dave Airlie [Sun, 2 May 2004 12:27:17 +0000 (12:27 +0000)]
better device class support from Jon Smirls patches..
Dave Airlie [Mon, 26 Apr 2004 06:43:53 +0000 (06:43 +0000)]
add another tdfx
Dave Airlie [Thu, 22 Apr 2004 12:41:43 +0000 (12:41 +0000)]
Add __user annotations from kernel
Dave Airlie [Thu, 22 Apr 2004 11:31:55 +0000 (11:31 +0000)]
add sparc ffb files from kernel just to keep things in sync
Dave Airlie [Wed, 21 Apr 2004 23:45:18 +0000 (23:45 +0000)]
add new files to generate pci ids
Dave Airlie [Wed, 21 Apr 2004 12:18:42 +0000 (12:18 +0000)]
bug from Linux kernel list caught by checker
Dave Airlie [Wed, 21 Apr 2004 12:13:31 +0000 (12:13 +0000)]
centralise pci ids into one place and use scripts to generate files for
kernel
Michel Daenzer [Sun, 18 Apr 2004 22:59:01 +0000 (22:59 +0000)]
Move Makefile.linux to Makefile.
Get rid of Makefile juggling hacks which are no longer necessary.
Thomas Hellstrom [Mon, 12 Apr 2004 10:18:18 +0000 (10:18 +0000)]
1. Added a PCI ID.
2. Big change to the XvMC part of the SAREA. OpenGL clients will not suffer
from this, and via XvMC is still alpha. Needed to make future additions
to XvMC (More decoders and overlays) possible.
3. Bumped version number to 1.3.0.
Dave Airlie [Mon, 12 Apr 2004 05:44:16 +0000 (05:44 +0000)]
more files for mach64
Dave Airlie [Mon, 12 Apr 2004 05:27:40 +0000 (05:27 +0000)]
Add mach64 to the trunk
Michel Daenzer [Sat, 10 Apr 2004 16:20:00 +0000 (16:20 +0000)]
Have CVS ignore some files produced by the build.
Dave Airlie [Sat, 10 Apr 2004 13:52:43 +0000 (13:52 +0000)]
white space changes to align with kernel
Dave Airlie [Sat, 10 Apr 2004 13:25:30 +0000 (13:25 +0000)]
include highmem.h
Dave Airlie [Sat, 10 Apr 2004 12:58:18 +0000 (12:58 +0000)]
update gamma_dma with patch from davej in 2.6
Dave Airlie [Sat, 10 Apr 2004 08:15:48 +0000 (08:15 +0000)]
patch from Andrew Morton tree from Arjan van de Ven fixes some oopses seen
with 4G/4G split
Dave Airlie [Sat, 10 Apr 2004 07:41:19 +0000 (07:41 +0000)]
align code with Linux kernel.
Dave Airlie [Sat, 10 Apr 2004 07:39:00 +0000 (07:39 +0000)]
remove unused code
Dave Airlie [Sat, 10 Apr 2004 07:36:30 +0000 (07:36 +0000)]
update from linux kernel for ia64
Alan Hourihane [Fri, 9 Apr 2004 00:21:43 +0000 (00:21 +0000)]
remove Imakefile
Alan Hourihane [Thu, 8 Apr 2004 23:22:05 +0000 (23:22 +0000)]
fix build problem
Alan Hourihane [Thu, 8 Apr 2004 23:19:15 +0000 (23:19 +0000)]
disable PCI DMA ioctls as they are not used currently until SAVAGE_CMD_DMA
is made to work.
Dave Airlie [Thu, 8 Apr 2004 14:15:36 +0000 (14:15 +0000)]
big whitespace .. this aligns all the whitespace in this file with the bk
checkout linux tree
Dave Airlie [Thu, 8 Apr 2004 13:11:04 +0000 (13:11 +0000)]
2.6 sysfs patches + stubs in drmP.h for 2.4 compatibility
Dave Airlie [Thu, 8 Apr 2004 12:25:31 +0000 (12:25 +0000)]
long dev_t patches from 2.6 tree
Dave Airlie [Thu, 8 Apr 2004 12:22:22 +0000 (12:22 +0000)]
2.6 patches for larger dev_t
Dave Airlie [Thu, 8 Apr 2004 12:20:39 +0000 (12:20 +0000)]
more 2.4 compat fns
Dave Airlie [Thu, 8 Apr 2004 12:09:10 +0000 (12:09 +0000)]
patch from Linux kernel 2.6.5
Dave Airlie [Thu, 8 Apr 2004 12:05:25 +0000 (12:05 +0000)]
fixes from Linux kernel
Dave Airlie [Thu, 8 Apr 2004 11:26:52 +0000 (11:26 +0000)]
patch from lk
Thomas Hellstrom [Wed, 31 Mar 2004 22:05:57 +0000 (22:05 +0000)]
VIA module fixes:
1. Fixed up PCI-id's.
2. Fixed 2.6 warning in kernel Makefile.
Dave Airlie [Fri, 26 Mar 2004 15:52:11 +0000 (15:52 +0000)]
copy correct Makefile
Thomas Hellstrom [Fri, 26 Mar 2004 13:42:48 +0000 (13:42 +0000)]
Added via driver to drm/linux/Config.in Reported by: Terry Barnaby
Thomas Hellstrom [Wed, 24 Mar 2004 23:22:22 +0000 (23:22 +0000)]
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
Thomas Hellstrom [Wed, 24 Mar 2004 10:07:37 +0000 (10:07 +0000)]
Modified linux/Kconfig to include the via drm driver.
Thomas Hellstrom [Tue, 23 Mar 2004 21:14:17 +0000 (21:14 +0000)]
Merged via-1-2-0: Altered Makefiles in drm/linux
Thomas Hellstrom [Tue, 23 Mar 2004 21:08:48 +0000 (21:08 +0000)]
Merged via-1-2-0
Dave Airlie [Tue, 23 Mar 2004 11:17:03 +0000 (11:17 +0000)]
make sure in DRM toplevel
Dave Airlie [Tue, 23 Mar 2004 11:06:47 +0000 (11:06 +0000)]
initial shell script to create linux kernel drm from the DRI one
Jon Smirl [Wed, 17 Mar 2004 01:03:26 +0000 (01:03 +0000)]
Adjust shared path in makefile XFree86 bug: Reported by: Submitted by:
Reviewed by: Obtained from:
Jon Smirl [Tue, 16 Mar 2004 00:59:24 +0000 (00:59 +0000)]
Makefile the makefile really clean everything XFree86 bug: Reported by:
Submitted by: Reviewed by: Obtained from:
Jon Smirl [Tue, 16 Mar 2004 00:52:24 +0000 (00:52 +0000)]
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:
Jon Smirl [Fri, 12 Mar 2004 21:22:52 +0000 (21:22 +0000)]
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:
Michel Daenzer [Sat, 28 Feb 2004 14:29:44 +0000 (14:29 +0000)]
Remove extraneous code accidentally added with revision 1.86
Michel Daenzer [Sat, 28 Feb 2004 11:52:19 +0000 (11:52 +0000)]
More differentiated error codes for DRM(agp_acquire)
Obtained from: Linux kernel
Felix Kuehling [Tue, 24 Feb 2004 14:24:07 +0000 (14:24 +0000)]
Use DO_MUNMAP_4_ARGS macro defined in Makefile.linux (Steve Holland).
Silence a warning about a format-argument mismatch in printk.
Felix Kuehling [Sun, 22 Feb 2004 16:20:16 +0000 (16:20 +0000)]
Merged the Savage DRM driver from the savage-2-0-0-branch into the trunk.
Felix Kuehling [Sat, 21 Feb 2004 19:54:51 +0000 (19:54 +0000)]
Conditionally add definition of list_for_each_entry_safe for kernel
versions that don't have it.
Keith Whitwell [Fri, 20 Feb 2004 22:55:12 +0000 (22:55 +0000)]
drm_ctx_dtor.patch Submitted by: Erdi Chen
Michel Daenzer [Wed, 18 Feb 2004 20:56:58 +0000 (20:56 +0000)]
Fix sisfb header location for 2.6 kernels
Submitted by: Andrew Morton
Michel Daenzer [Sun, 11 Jan 2004 00:14:28 +0000 (00:14 +0000)]
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.
Michel Daenzer [Sat, 10 Jan 2004 20:59:16 +0000 (20:59 +0000)]
Make sure that all state packets are handled in
radeon_check_and_fixup_packets()
Fix state packet IDs of R200 cubic offsets
Michel Daenzer [Sat, 10 Jan 2004 12:28:06 +0000 (12:28 +0000)]
R200_PP_CUBIC_OFFSET_F1_[0-6] state packets only contain 5 offsets, not 6
(thanks to Andreas Stenglein for spotting this)
Eric Anholt [Tue, 6 Jan 2004 04:54:25 +0000 (04:54 +0000)]
Fix some misuse of NULL where 0 is intended.
Obtained from: FreeBSD CVS
Eric Anholt [Tue, 16 Dec 2003 08:57:08 +0000 (08:57 +0000)]
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
Eric Anholt [Tue, 16 Dec 2003 07:39:43 +0000 (07:39 +0000)]
Add a collection of Radeon and R128 PCI IDs, including the IGP chipsets.
Submitted by: Donnie Berkholz <spyderous@gentoo.org> (mostly)
Keith Whitwell [Mon, 8 Dec 2003 16:33:08 +0000 (16:33 +0000)]
Add i865 pci id
Eric Anholt [Wed, 12 Nov 2003 20:30:51 +0000 (20:30 +0000)]
Fix a locking nit, and add asserts in some things that should be called
with locks held.
Eric Anholt [Thu, 6 Nov 2003 04:48:06 +0000 (04:48 +0000)]
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.
Eric Anholt [Thu, 6 Nov 2003 04:35:08 +0000 (04:35 +0000)]
Remove unused variable.
Alan Hourihane [Wed, 5 Nov 2003 20:47:28 +0000 (20:47 +0000)]
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)
Eric Anholt [Wed, 5 Nov 2003 08:13:52 +0000 (08:13 +0000)]
- Tie the DRM to a specific device: setunique no longer succeeds when given
a busid that doesn't correspond to the device the DRM is attached to.
This is a breaking of backwards-compatibility only for the
multiple-DRI-head case with X Servers that don't use interface 1.1.
- Move irq_busid to drm_irq.h and make it only return the IRQ for the
current device. Retains compatibility with previous X Servers, cleans
up unnecessary code. This means no irq_busid on !__HAVE_IRQ, but can be
changed if necessary.
- Bump interface version to 1.2. This version when set signifies that the
control ioctl should ignore the irq number passed in and enable the
interrupt handler for the attached device. Otherwise it errors out when
the passed-in irq is not equal to the device's.
- Store the highest version the interface has been set to in the device.
- Fix a recursion on DRM_LOCK in irq_uninstall on FreeBSD. This leaves
irq_uninstall being done without the lock in some cases, but it was
racey anyways.
Eric Anholt [Wed, 5 Nov 2003 02:42:56 +0000 (02:42 +0000)]
Use int64_t instead of s64 -- fixes FreeBSD compile, works on linux.
Eric Anholt [Wed, 5 Nov 2003 02:41:50 +0000 (02:41 +0000)]
Args for the BSD DRM_PUT_USER_UNCHECKED were swapped.
Eric Anholt [Wed, 5 Nov 2003 02:08:31 +0000 (02:08 +0000)]
__linux__ is spelled with a lowercase 'l'
Eric Anholt [Wed, 5 Nov 2003 01:43:47 +0000 (01:43 +0000)]
Repo-copy linux/drm/kernel/drm.h to shared/drm/kernel/drm.h and use it on
both Linux and *BSD.
Eric Anholt [Wed, 5 Nov 2003 00:49:35 +0000 (00:49 +0000)]
Remove buf_alloc which is unused since the locking commit.
Michel Daenzer [Tue, 4 Nov 2003 00:59:52 +0000 (00:59 +0000)]
build fix
Michel Daenzer [Tue, 4 Nov 2003 00:46:05 +0000 (00:46 +0000)]
Memory layout transition:
the 2D driver initializes MC_FB_LOCATION and related registers sanely
the DRM deduces the layout from these registers
clients use the new SETPARAM ioctl to tell the DRM where they think the
framebuffer is located in the card's address space
the DRM uses all this information to check client state and fix it up if
necessary
This is a prerequisite for things like direct rendering with IGP chips and
video capturing.
Eric Anholt [Mon, 3 Nov 2003 05:11:04 +0000 (05:11 +0000)]
Add i852/i855 PCI ID. Also fix whitespace in the other ID definitions.
Eric Anholt [Mon, 27 Oct 2003 22:05:38 +0000 (22:05 +0000)]
Add a DRM_PUT_USER_UNCHECKED, which will be used by an upcoming radeon
change.
Eric Anholt [Fri, 24 Oct 2003 21:49:28 +0000 (21:49 +0000)]
Don't try to use dev->dma_lock unless dma is initialized (dev->dma != NULL)
in bufs_info sysctl handler. dev->dma and dev->dma_lock existence are
protected by DRM_LOCK(). Fixes panic on sysctl hw.dri when the device
is uninitialied (when you aren't in X).
Jon Smirl [Fri, 24 Oct 2003 17:40:54 +0000 (17:40 +0000)]
Switch pci enumeration call to work on both 2.4 and 2.6 pci_for_each_dev is
not supported on 2.6
Eric Anholt [Fri, 24 Oct 2003 00:59:31 +0000 (00:59 +0000)]
Move the REALLY_HAVE_AGP endif above the mtrr functions. Broke tdfx module.
Eric Anholt [Thu, 23 Oct 2003 05:56:13 +0000 (05:56 +0000)]
Move to "old-style" probing as documented in linux/Documentation/pci.txt.
This should resolve the probe problems with radeon framebuffer due to
pci_driver attachment being exclusive.
Eric Anholt [Thu, 23 Oct 2003 05:52:19 +0000 (05:52 +0000)]
Missed the sis.h header in Makefile.linux in the move to shared/.
Eric Anholt [Thu, 23 Oct 2003 05:51:35 +0000 (05:51 +0000)]
The SiS300 pci id also covers the 305, so make the name reflect that.