OSDN Git Service
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
Dave Airlie [Sun, 23 Oct 2005 04:07:50 +0000 (04:07 +0000)]
we don't use this stuff anymore .. remove 1k buffer from driver ..
Thomas Hellstrom [Sat, 22 Oct 2005 15:12:05 +0000 (15:12 +0000)]
via: Sync via_drm.h with 3D driver. Bump via patchlevel and date.
Adam Jackson [Sat, 22 Oct 2005 05:50:22 +0000 (05:50 +0000)]
Bug #328: Silence read-from-uninitialized warnings in DRM_CAS on Alpha.
(David Dawes)
Alan Hourihane [Fri, 21 Oct 2005 08:59:56 +0000 (08:59 +0000)]
Don't set MTRR's for intel hardware
Dave Airlie [Thu, 20 Oct 2005 22:41:26 +0000 (22:41 +0000)]
fix G550 cards
Adam Jackson [Thu, 20 Oct 2005 17:55:02 +0000 (17:55 +0000)]
Bump to 1.0.4.
Adam Jackson [Thu, 20 Oct 2005 17:53:02 +0000 (17:53 +0000)]
Remove the remaining references to Xlib. libdrm is totally independent now.
Adam Jackson [Thu, 20 Oct 2005 17:51:57 +0000 (17:51 +0000)]
via and r300 still need installed reg headers.
Thomas Hellstrom [Thu, 20 Oct 2005 17:37:32 +0000 (17:37 +0000)]
via: PCI DMA bugfixes and DOS due to too many mapped pages checks.
Adam Jackson [Thu, 20 Oct 2005 17:32:31 +0000 (17:32 +0000)]
Remove bogus Xlib dependency.
Dave Airlie [Thu, 20 Oct 2005 02:35:08 +0000 (02:35 +0000)]
dma access also needs some work
Dave Airlie [Thu, 20 Oct 2005 01:54:38 +0000 (01:54 +0000)]
the old init path needs to set WAGP_ENABLE by default
Ian Romanick [Fri, 14 Oct 2005 05:01:19 +0000 (05:01 +0000)]
Doig a full clean up from mga_do_dma_bootstrap when
mga_do_agp_dma_bootstrap fails causes problems if
mga_do_pci_dma_bootstrap succeeds. This commit makes it possible to do
a "minimal" clean up instead. I'm still trying to figure out what is
causing the failures in mga_do_agp_dma_bootstrap...
Signed-off-by: Ian Romanick <idr@us.ibm.com>
Ian Romanick [Fri, 14 Oct 2005 01:25:38 +0000 (01:25 +0000)]
Fixed a cut-and-paste bug that could cause an oops in mga_do_cleanup_dma
when mga_do_init_dma fails. Still trying to determine why
mga_do_init_dma is failing.
Signed-off-by: Ian Romanick <idr@us.ibm.com>
Adam Jackson [Thu, 13 Oct 2005 21:03:31 +0000 (21:03 +0000)]
Better pkgconfig-fu: -ldrm in Libs:
Dave Airlie [Thu, 13 Oct 2005 11:21:31 +0000 (11:21 +0000)]
Add X300 RV370
Ian Romanick [Tue, 11 Oct 2005 17:34:49 +0000 (17:34 +0000)]
The Linux 2.6.9 (and earlier) fops structure does not contain a
.compat_ioctl field. This change makes the DRM build on those kernels.
Signed-off-by: Ian Romanick <idr@us.ibm.com>
Adam Jackson [Thu, 6 Oct 2005 23:31:29 +0000 (23:31 +0000)]
Skeleton nv drm driver, to enable DMA in EXA. (Lars Knoll, minor updates by
me)
Dave Airlie [Thu, 6 Oct 2005 23:08:58 +0000 (23:08 +0000)]
remove version not used anymore
Dave Airlie [Fri, 30 Sep 2005 09:09:03 +0000 (09:09 +0000)]
fix header this is now a c file
Dave Airlie [Fri, 30 Sep 2005 07:10:16 +0000 (07:10 +0000)]
now I've lindented kernel it might be useful again
Dave Airlie [Fri, 30 Sep 2005 06:41:10 +0000 (06:41 +0000)]
Add support to turn writeback off via radeon module option
Dave Airlie [Fri, 30 Sep 2005 06:35:09 +0000 (06:35 +0000)]
fix pci overriding from userspace
Dave Airlie [Fri, 30 Sep 2005 03:39:02 +0000 (03:39 +0000)]
fixup bens fix so it works..
Dave Airlie [Fri, 30 Sep 2005 03:14:18 +0000 (03:14 +0000)]
Add Bens fix for radeon maps on ppc
Thomas Hellstrom [Sun, 25 Sep 2005 14:38:07 +0000 (14:38 +0000)]
via: fix stray error printout message.
Thomas Hellstrom [Sun, 25 Sep 2005 12:54:12 +0000 (12:54 +0000)]
Add the via PCI DMA blit code.
Dave Airlie [Sun, 25 Sep 2005 08:54:31 +0000 (08:54 +0000)]
hopefully fix server recycling on PCIE
Dave Airlie [Sun, 25 Sep 2005 05:19:06 +0000 (05:19 +0000)]
add __ATTR
Dave Airlie [Sun, 25 Sep 2005 03:09:51 +0000 (03:09 +0000)]
use linux kernel macros don't make our own
Dave Airlie [Sun, 18 Sep 2005 09:31:06 +0000 (09:31 +0000)]
remove pci_find_class use for alpha
Dave Airlie [Sat, 17 Sep 2005 04:16:51 +0000 (04:16 +0000)]
compat for pci_pretty_name
Dave Airlie [Mon, 12 Sep 2005 06:21:24 +0000 (06:21 +0000)]
update autogen from xserver tree
Eric Anholt [Mon, 12 Sep 2005 05:35:51 +0000 (05:35 +0000)]
Fix the spelling of DRM_AUTH so that the bsd core stuff builds again. Next
up is pcigart.
Dave Airlie [Mon, 12 Sep 2005 04:37:52 +0000 (04:37 +0000)]
add some pci express chips
Dave Airlie [Mon, 12 Sep 2005 04:35:31 +0000 (04:35 +0000)]
make PCI Express work on 64-bit machines, thanks to Alex Deucher (agd5f)
Dave Airlie [Sun, 11 Sep 2005 09:58:19 +0000 (09:58 +0000)]
back out change as gart is now in framebuffer for PCIE
Dave Airlie [Sun, 11 Sep 2005 08:51:23 +0000 (08:51 +0000)]
Add GART in FB support for ati pcigart, and PCIE support for r300
Dave Airlie [Sun, 11 Sep 2005 07:08:46 +0000 (07:08 +0000)]
fix makefile bug
Roland Scheidegger [Fri, 9 Sep 2005 22:35:49 +0000 (22:35 +0000)]
Add support for GL_ATI_fragment_shader, new packets R200_EMIT_PP_AFS_0/1,
R200_EMIT_PP_TXCTLALL_0-5 (replaces R200_EMIT_PP_TXFILTER_0-5, 2 more
regs) and R200_EMIT_ATF_TFACTOR (replaces R200_EMIT_TFACTOR_0 (8 consts
instead of 6)
Vladimir Dergachev [Fri, 9 Sep 2005 12:53:44 +0000 (12:53 +0000)]
Add another R300 PCI id. Submitted by: Daniel Estévez
Dave Airlie [Sat, 3 Sep 2005 03:27:14 +0000 (03:27 +0000)]
convert ioctl flags to use flags instead of separate ints
Dave Airlie [Sat, 3 Sep 2005 02:21:22 +0000 (02:21 +0000)]
check is the map containing the lock
Eric Anholt [Fri, 26 Aug 2005 23:27:19 +0000 (23:27 +0000)]
- Don't try to allocate mappings of less than a PAGE_SIZE in MGA DMA code.
- Comment out the "is this mapping/bufs in allocated AGP" bits in BSD
because they break mga (which uses AGP allocation that doesn't track
entries). It's not a security issue when we still have the related
ioctls marked root-only.
- Apply some power-of-two alignment restrictions to hopefully avoid some
panicing in bad cases of drm_pci_alloc() on FreeBSD.
- Add verbosity to some error handling that I found useful while debugging.
Eric Anholt [Fri, 26 Aug 2005 20:56:11 +0000 (20:56 +0000)]
Previously, drm_get_resource_start() and drm_get_resource_len() would
allocate the resource RF_ACTIVE, pull out the appropriate value, and
return it. However, allocating large framebuffers RF_ACTIVE would run
the system out of KVA, and this also left open the possibility of the
resource getting moved after getting the offset. Instead, when either
of these are called, allocate the resource if it isn't allocated
already (non-RF_ACTIVE) and store it in the DRM device, to be cleaned
up on lastclose.
Eric Anholt [Fri, 26 Aug 2005 19:07:03 +0000 (19:07 +0000)]
Fix a lack of parenthesis in macro usage that showed up with INVARIANTS
turned on, i.e. in a kernel build.
Eric Anholt [Fri, 26 Aug 2005 00:16:01 +0000 (00:16 +0000)]
[1] Fix BSD DRM for the nonroot changes. [2] Don't attempt to acquire the
DMA lock in a non-DMA driver, as it will be uninitialized.
Submitted by: [1] jkim (minor changes by me)
Eric Anholt [Thu, 25 Aug 2005 23:11:28 +0000 (23:11 +0000)]
Add missing .cvsignore files for autotoolery.
Eric Anholt [Thu, 25 Aug 2005 02:59:21 +0000 (02:59 +0000)]
Include appropriate CFLAGS to find X headers, needed to build libdrm.
Dave Airlie [Tue, 23 Aug 2005 04:10:50 +0000 (04:10 +0000)]
add options for x86_64 and amd will small letters
Alan Hourihane [Mon, 22 Aug 2005 09:52:18 +0000 (09:52 +0000)]
remove the README in the linux-2.6 directory
Alan Hourihane [Mon, 22 Aug 2005 09:50:12 +0000 (09:50 +0000)]
remove i915_pm code as it causes too many issues with current software
suspend, and the DDX driver re-inits the board successfully anyway.
Dave Airlie [Sun, 21 Aug 2005 11:07:03 +0000 (11:07 +0000)]
allocating the PCIE table from GFP_DMA seems to stop it NMI'ing
Dave Airlie [Sun, 21 Aug 2005 03:04:32 +0000 (03:04 +0000)]
We don't need to install all the internal headers files only drm.h and
*_drm.h have user space interfaces
Dave Airlie [Sat, 20 Aug 2005 07:38:11 +0000 (07:38 +0000)]
add x86_64 to the list as well
Dave Airlie [Sat, 20 Aug 2005 07:33:07 +0000 (07:33 +0000)]
remove checks that make ppc64 not work properly... also fix ppc64 check..
we should be safe doing this..