OSDN Git Service
Dave Airlie [Sun, 19 Feb 2006 12:08:14 +0000 (12:08 +0000)]
experimental PCI DMA fixes use proper Linux interfaces
Dave Airlie [Sun, 19 Feb 2006 12:06:27 +0000 (12:06 +0000)]
missed a piece of benh patch
Dave Airlie [Sat, 18 Feb 2006 05:43:19 +0000 (05:43 +0000)]
make some functions static from the kernel
Dave Airlie [Sat, 18 Feb 2006 05:30:03 +0000 (05:30 +0000)]
fix brace placement
Dave Airlie [Sat, 18 Feb 2006 04:18:45 +0000 (04:18 +0000)]
always enable and set master on pci device
Dave Airlie [Sat, 18 Feb 2006 04:13:36 +0000 (04:13 +0000)]
clear i915 interrupts sources on server exit
Dave Airlie [Sat, 18 Feb 2006 03:21:29 +0000 (03:21 +0000)]
add proper checking for bitblt multi
Dave Airlie [Sat, 18 Feb 2006 03:04:30 +0000 (03:04 +0000)]
add benh's memory management patch
Dave Airlie [Sat, 18 Feb 2006 03:01:38 +0000 (03:01 +0000)]
fix build wrong function call
Dave Airlie [Sat, 18 Feb 2006 02:53:36 +0000 (02:53 +0000)]
major realigment of DRM CVS with kernel code, makes integration much easier
Dave Airlie [Sat, 18 Feb 2006 02:38:07 +0000 (02:38 +0000)]
fix card unload
Dave Airlie [Sat, 18 Feb 2006 02:34:53 +0000 (02:34 +0000)]
Fixup test for memory at end of memory space
Thomas Hellstrom [Fri, 17 Feb 2006 17:25:41 +0000 (17:25 +0000)]
via: Change via_drm.h versioning scheme after lenghty discussion on
unichrome-users.
Thomas Hellstrom [Fri, 17 Feb 2006 16:54:37 +0000 (16:54 +0000)]
file i915_ttm.c was initially added on branch drm-ttm-branch.
Keith Whitwell [Thu, 9 Feb 2006 23:14:16 +0000 (23:14 +0000)]
Update the hardware breadcrumb in the sarea on irq reception so that
clients can avoid an ioctl waiting on fences that have already been
received. Would be even better if the hardware did the update itself.
Thomas Hellstrom [Wed, 1 Feb 2006 12:58:38 +0000 (12:58 +0000)]
file drm_mm.c was initially added on branch drm-ttm-branch.
Alan Hourihane [Thu, 26 Jan 2006 12:14:09 +0000 (12:14 +0000)]
add missing name, desc, date, major, minor and patchlevel entries
Alan Hourihane [Tue, 24 Jan 2006 21:24:53 +0000 (21:24 +0000)]
fix an error message typo Unkown -> Unknown
Alan Hourihane [Tue, 24 Jan 2006 21:18:41 +0000 (21:18 +0000)]
other part of revert
Alan Hourihane [Tue, 24 Jan 2006 21:16:54 +0000 (21:16 +0000)]
put back some of Dave's code related to vblank support - accidentally
reverted.
Thomas Hellstrom [Tue, 24 Jan 2006 14:08:05 +0000 (14:08 +0000)]
file Makefile.am was initially added on branch drm-ttm-branch.
Thomas Hellstrom [Tue, 24 Jan 2006 11:20:05 +0000 (11:20 +0000)]
file drm_hashtab.c was initially added on branch drm-ttm-branch.
Alan Hourihane [Mon, 23 Jan 2006 10:05:22 +0000 (10:05 +0000)]
Fix CMDBUFFER path, add heap destroy and flesh out sarea for rotation
(Tungsten Graphics)
Aapo Tahkola [Fri, 20 Jan 2006 21:45:28 +0000 (21:45 +0000)]
Add support for texture cache flushes (R300_TX_CNTL)
Aapo Tahkola [Fri, 20 Jan 2006 21:30:07 +0000 (21:30 +0000)]
Sync from r300_reg.h from Mesa.
Alan Hourihane [Thu, 19 Jan 2006 14:14:06 +0000 (14:14 +0000)]
add Intel i945GM support
Thomas Hellstrom [Thu, 12 Jan 2006 19:08:16 +0000 (19:08 +0000)]
via: direction bug in get_user_pages call in via_dmablit.c fixed. Bumped
minor since this causes the via DDX to fail with vlc video player.
Thomas Hellstrom [Fri, 6 Jan 2006 11:57:40 +0000 (11:57 +0000)]
via: Version via_drm.h Alter the drm_via_dmablit_t IOCTL arg.
Thomas Hellstrom [Fri, 6 Jan 2006 11:52:01 +0000 (11:52 +0000)]
via: Last commit really required a bump of minor. Fix.
Thomas Hellstrom [Fri, 6 Jan 2006 11:19:06 +0000 (11:19 +0000)]
via: Combine PCI DMA transfers with stride==width (Idea from Luc
Verhaegen). A somewhat saner PCI DMA transfer size check. Fix some
typos. Bump patchlevel.
Dave Airlie [Mon, 2 Jan 2006 09:17:41 +0000 (09:17 +0000)]
nothing from VIA or S3 in this
Dave Airlie [Mon, 2 Jan 2006 05:55:31 +0000 (05:55 +0000)]
make max minor more rational
Dave Airlie [Mon, 2 Jan 2006 05:54:10 +0000 (05:54 +0000)]
use drm_cards_limit instead of cards_limit
Dave Airlie [Mon, 2 Jan 2006 05:52:17 +0000 (05:52 +0000)]
use common read/write routines
Dave Airlie [Mon, 2 Jan 2006 05:43:04 +0000 (05:43 +0000)]
sparse cleanups
Dave Airlie [Mon, 2 Jan 2006 05:39:19 +0000 (05:39 +0000)]
The radeon DRM wasn't passing sparse checking in the kernel, this fixes it
by adding a new kernel internal cmd buffer type, that has no userspace
members, and passes it around.
Dave Airlie [Mon, 2 Jan 2006 05:38:03 +0000 (05:38 +0000)]
align spacing with kernel
Dave Airlie [Mon, 2 Jan 2006 05:22:50 +0000 (05:22 +0000)]
whitespace cleanup/aligment with kernel
Dave Airlie [Mon, 2 Jan 2006 03:44:23 +0000 (03:44 +0000)]
some fixes from linux kernel
Dave Airlie [Mon, 2 Jan 2006 03:32:03 +0000 (03:32 +0000)]
complete fix for historic attribution
Dave Airlie [Mon, 2 Jan 2006 03:30:57 +0000 (03:30 +0000)]
complete fix for attribution
Dave Airlie [Mon, 2 Jan 2006 03:25:49 +0000 (03:25 +0000)]
Realign via driver with changes in Linux kernel (mainly whitespace)
Eric Anholt [Sat, 31 Dec 2005 11:48:12 +0000 (11:48 +0000)]
Initialize sv.drm_dd_minor to "don't care" along with dd_major, to appease
valgrind.
Eric Anholt [Fri, 30 Dec 2005 02:17:05 +0000 (02:17 +0000)]
Merge patch from jhb to catch up with FreeBSD-current vgapci master device
changes.
Dave Airlie [Thu, 29 Dec 2005 00:17:51 +0000 (00:17 +0000)]
add radeon card type get param so userspace can avoid walking PCI
Dave Airlie [Wed, 28 Dec 2005 23:49:59 +0000 (23:49 +0000)]
Add vblank support to i915 DRM..
Dave Airlie [Wed, 28 Dec 2005 22:36:51 +0000 (22:36 +0000)]
step back one reported bugs against that patch
Dave Airlie [Fri, 16 Dec 2005 08:02:17 +0000 (08:02 +0000)]
fix radeon memory mapping from Ben Herrenschmidt
Dave Airlie [Fri, 16 Dec 2005 07:59:13 +0000 (07:59 +0000)]
Lindent some via files
Eric Anholt [Mon, 5 Dec 2005 10:53:06 +0000 (10:53 +0000)]
Remove driver.device_is_agp code duplicated in drm_device_find_capability,
when it really wanted to live in drm_device_is_agp.
Dave Airlie [Mon, 5 Dec 2005 01:11:20 +0000 (01:11 +0000)]
add texrect support for r300
Dave Airlie [Sun, 4 Dec 2005 01:24:23 +0000 (01:24 +0000)]
Fix from SuSE for issue with context creation failure
Eric Anholt [Fri, 2 Dec 2005 23:55:21 +0000 (23:55 +0000)]
Add RV410 X700PRO PCI ID
Submitted by: Adam K Kirchhoff <adamk@voicenet.com>
Eric Anholt [Fri, 2 Dec 2005 23:41:47 +0000 (23:41 +0000)]
Finish the last bits necessary to get the i915 DRM port working on FreeBSD
Submitted by: Alexey Popov <llp@iteranet.com>
Eric Anholt [Fri, 2 Dec 2005 08:47:04 +0000 (08:47 +0000)]
FreeBSD PR kern/85479: Restore the enabling of debugging by default by the
DRM_DEBUG kernel option. It remains controlled by hw.dri.*.debug no
matter what.
Adam Jackson [Wed, 30 Nov 2005 18:44:54 +0000 (18:44 +0000)]
Bump package and DSO numbers to 2.0 to reflect 32/64 ABI change
Adam Jackson [Wed, 30 Nov 2005 03:51:46 +0000 (03:51 +0000)]
Resync from Xorg head: conditional include of xorg-config.h
Adam Jackson [Wed, 30 Nov 2005 02:55:14 +0000 (02:55 +0000)]
Resync from Xorg head (Bug #3815, GNU/kFreeBSD hack)
Adam Jackson [Tue, 29 Nov 2005 21:10:59 +0000 (21:10 +0000)]
Add TODO based on my email from a while ago
Adam Jackson [Tue, 29 Nov 2005 20:03:38 +0000 (20:03 +0000)]
Remove redundant #ifdef stanza
Adam Jackson [Tue, 29 Nov 2005 20:02:34 +0000 (20:02 +0000)]
Error checking for drmStrdup (Tilman Sauerbeck)
Dave Airlie [Tue, 29 Nov 2005 09:50:47 +0000 (09:50 +0000)]
fixup xf86drm.c for new headers
Dave Airlie [Tue, 29 Nov 2005 09:46:27 +0000 (09:46 +0000)]
Fix from Hugh Dickins for consistent mapping
Dave Airlie [Tue, 29 Nov 2005 09:19:20 +0000 (09:19 +0000)]
fixes from Egbert for 64bit
Eric Anholt [Mon, 28 Nov 2005 23:10:41 +0000 (23:10 +0000)]
Assert an MIT copyright on sis_drm.h, since one was lacking and I created
that particular file. Its contents have changed a good bit since the
original sis code, and the original sis code didn't care much about
attribution since it routinely disclaims Precision Insight/VA Linux
from responsibility. Also, adjust formatting around license headers
(have a comment open immediately before the "Copyright" line, not as a
runon of any previous comments) for automatic processing into FreeBSD,
where /*- is used to signal the beginning of license headers for
automatic compilation of license lists.
Adam Jackson [Mon, 28 Nov 2005 22:18:12 +0000 (22:18 +0000)]
remove xf86drmCompat.*, unused since about XFree86 4.2.
Eric Anholt [Mon, 28 Nov 2005 21:15:46 +0000 (21:15 +0000)]
Fix AGP support guessing: Implement the same bridge checking in the MGA
driver as Linux uses, and actually use the driver's device_is_agp if
available (hopefully fixing i915).
Brian Paul [Mon, 28 Nov 2005 17:33:01 +0000 (17:33 +0000)]
fix mem leak in HashHash() (bug 5171)
Thomas Hellstrom [Wed, 16 Nov 2005 10:55:53 +0000 (10:55 +0000)]
Fixed long standing 64-bit bug in via memory manager. Bumped via date and
patchlevel.
Thomas Hellstrom [Tue, 15 Nov 2005 11:20:47 +0000 (11:20 +0000)]
Loosen via dmablit alignment checks somewhat. Adapt stride check to maximum
sceen size for EXA.
Eric Anholt [Tue, 15 Nov 2005 09:22:09 +0000 (09:22 +0000)]
Fix compiling and reenable build of i915 driver.
Eric Anholt [Tue, 15 Nov 2005 04:37:51 +0000 (04:37 +0000)]
Fix Savage DRI without ShadowStatus NO by allowing the shadow area to be
mapped.
Dave Airlie [Fri, 11 Nov 2005 12:23:18 +0000 (12:23 +0000)]
enable i915 32/64 bit ioctls
Dave Airlie [Fri, 11 Nov 2005 10:56:31 +0000 (10:56 +0000)]
RV200 < R200
Dave Airlie [Fri, 11 Nov 2005 10:52:23 +0000 (10:52 +0000)]
i810 should be fine with i810.. no idea what this crack is ..
Dave Airlie [Fri, 11 Nov 2005 10:02:10 +0000 (10:02 +0000)]
fix up radeon whitespace
Eric Anholt [Fri, 11 Nov 2005 09:36:58 +0000 (09:36 +0000)]
Fix breakage from the move of driver ioctl externs to header files.
Dave Airlie [Fri, 11 Nov 2005 09:21:05 +0000 (09:21 +0000)]
whitespace align with kernel
Dave Airlie [Fri, 11 Nov 2005 09:20:34 +0000 (09:20 +0000)]
mixing breaks in r128 driver.. fixed in kernel
Dave Airlie [Fri, 11 Nov 2005 09:10:06 +0000 (09:10 +0000)]
copy correct Kconfig
Dave Airlie [Fri, 11 Nov 2005 09:09:03 +0000 (09:09 +0000)]
realign whitespace with kernel
Dave Airlie [Fri, 11 Nov 2005 09:07:08 +0000 (09:07 +0000)]
remove extra spaces
Dave Airlie [Fri, 11 Nov 2005 08:59:57 +0000 (08:59 +0000)]
A bunch of create_proc_dir_entry() calls creating directories had crept in
since the last sweep; converted to proc_mkdir().
From: Al Viro (via kernel)
Dave Airlie [Fri, 11 Nov 2005 08:42:36 +0000 (08:42 +0000)]
convert to use __set_current_state, align some header includes
Dave Airlie [Fri, 11 Nov 2005 08:07:11 +0000 (08:07 +0000)]
whitespace align closer with kernel
Dave Airlie [Fri, 11 Nov 2005 07:45:46 +0000 (07:45 +0000)]
cleanup ioctl/max_ioctl to use header file for extern symbols
Dave Airlie [Thu, 10 Nov 2005 10:14:48 +0000 (10:14 +0000)]
Fix cpu_to_le32 same as kernel not sure it is correct for ppc
Dave Airlie [Thu, 10 Nov 2005 10:13:25 +0000 (10:13 +0000)]
cleanup / whitespace align with kernel
Eric Anholt [Tue, 8 Nov 2005 21:40:03 +0000 (21:40 +0000)]
Correct a LOR issue on FreeBSD by allocating temporary space and doing a
single DRM_COPY_FROM_USER rather than DRM_VERIFYAREA_READ followed by
tons of DRM_COPY_FROM_USER_UNCHECKED. I don't like the look of the
temporary space allocation, but I like the simplification in the rest
of the file. Tested with glxgears, tuxracer, and q3 on a savage4.
Eric Anholt [Tue, 8 Nov 2005 21:36:54 +0000 (21:36 +0000)]
Correct another LOR issue with resource allocation. This leaves the
drm_get_resource_* resource allocation a little racy, but they're
getting called at either X Server startup or driver load, so it's
serialized anyway.
Eric Anholt [Tue, 8 Nov 2005 20:25:00 +0000 (20:25 +0000)]
Initial port of savage to FreeBSD for the AGP and !ShadowStatus case. Adds
drm_mtrr_{add,del} for handling the MTRR setup. Still has a LOR issue
with DRM_VERIFYAREA_READ/DRM_COPY_FROM_USER_UNCHECKED in savage_bci.c
-- this won't work with the fine-grained locking in use, and just doing
a single copyin to a temporary will probably work fine. Also note that
the module leaks approximately 4 kb on unload.
Eric Anholt [Tue, 8 Nov 2005 09:02:02 +0000 (09:02 +0000)]
Correct a LOR on FreeBSD by allocating a temporary buffer and doing a
single COPY_FROM_USER into it, rather than VERIFYAREA followed by many
COPY_FROM_USER_UNCHECKEDs.
Eric Anholt [Tue, 8 Nov 2005 06:11:55 +0000 (06:11 +0000)]
Correct a LOR related to the PCI resource allocations by simply moving the
uninit to unload time rather than lastclose.
Eric Anholt [Tue, 8 Nov 2005 05:29:26 +0000 (05:29 +0000)]
Fix FreeBSD DRM for latest MGA changes to agp support, which cleans things
up a good bit, I think. Also, remove the agp_uninit() function which
has lain around as a noop for years now. The FreeBSD DRM is now all
compiling, with the exception of via. One known sleeping-with-lock-held
issue remains.
Eric Anholt [Tue, 8 Nov 2005 02:38:01 +0000 (02:38 +0000)]
Catch FreeBSD up to the pcie gart changes. Required minor modification to
radeon_cp.c to use a drm_local_map_t-type mapping (drm_core_ioremap
rather than drm_ioremap), which contains private device mapping
information on BSD. I also changed the ati_pcigart interface to use
"void *" for pointers to kva rather than "unsigned long". While PCIGART
support appears to be broken on FreeBSD currently, I think this is not
new, and BusType PCI remains working on my r100 in Linux.
Eric Anholt [Tue, 8 Nov 2005 01:12:08 +0000 (01:12 +0000)]
Correct a recursion on non-recursive mutex in drm_addmap from radeon's
firstopen, by making drm_addmap require the drm device lock to be held.
Also, make matching of kernel maps match linux by requiring shm matches
to have the contains_lock flag set if the offset doesn't match.
Alan Hourihane [Mon, 7 Nov 2005 13:17:41 +0000 (13:17 +0000)]
Fix bug #4908 for now. Alternative is highlighted in this bug report as the
better future direction.
Eric Anholt [Sun, 6 Nov 2005 06:32:25 +0000 (06:32 +0000)]
Re-disable the via driver while it's broken on BSD.
Ian Romanick [Thu, 3 Nov 2005 00:38:25 +0000 (00:38 +0000)]
Converts the remaining drm_agp_foo functions to be a drm_agp_foo and
drm_agp_foo_ioctl pair. Modifies the MGA DRM to use the drm_agp_foo
functions instead of the drm_foo_agp functions. The drm_foo_agp
functions are no longer exported by drm.ko.
Ensures that dma->seg_count and dma->page_count are properly set in
drm_addbufs_{agp,sg,fb}. drm_addbufs_pci was already correct.
Ensures that mga_do_agp_dma_bootstrap correctly sets agp_buffer_token.
At this point PCI DMA is still broken.
Xorg bug: #4797 Reviewed by: Dave Airlie, Eric Anholt Signed-off-by: Ian
Romanick <idr@us.ibm.com>
Adam Jackson [Mon, 31 Oct 2005 17:48:11 +0000 (17:48 +0000)]
Bump to 1.0.5 for new via header