Alan Hourihane [Fri, 12 Sep 2003 14:24:17 +0000 (14:24 +0000)]
resolve merge conflicts
Keith Whitwell [Tue, 9 Sep 2003 07:45:12 +0000 (07:45 +0000)]
Use spldrm/splx around tsleep() in DRM_WAIT_ON
Eric Anholt [Sun, 7 Sep 2003 23:56:20 +0000 (23:56 +0000)]
Correct format in debug printfs (free is a pointer, not an int).
Eric Anholt [Sun, 7 Sep 2003 23:27:04 +0000 (23:27 +0000)]
Fix for older -stable.
Obtained from: FreeBSD CVS
Eric Anholt [Fri, 29 Aug 2003 21:41:32 +0000 (21:41 +0000)]
Update to reflect renaming of SIS ioctls.
Eric Anholt [Fri, 29 Aug 2003 20:54:26 +0000 (20:54 +0000)]
These files were missed in the SiS DRM commit.
Eric Anholt [Fri, 29 Aug 2003 19:24:36 +0000 (19:24 +0000)]
Port the SiS DRM to FreeBSD. This includes the ability for the DRM to
allocate framebuffer memory without sisfb, and a new ioctl to be used
by the X Server which tells the DRM what region of framebuffer memory
to allocate from. Also fixes a possibility to panic the kernel I
believe. Tested on linux with sisfb and FreeBSD (without sisfb) with
new DRI only.
Eric Anholt [Fri, 29 Aug 2003 19:16:13 +0000 (19:16 +0000)]
Add DRM(calloc), which is convenient, used by the new sis code, and takes
advantage of M_ZERO on BSDs.
Eric Anholt [Fri, 29 Aug 2003 19:08:06 +0000 (19:08 +0000)]
Update radeon PCI IDs.
Eric Anholt [Fri, 29 Aug 2003 19:07:27 +0000 (19:07 +0000)]
This PCI header has been living in dev/pci/ for a while now.
Michel Daenzer [Thu, 28 Aug 2003 12:14:17 +0000 (12:14 +0000)]
Remove superfluous TLB flush
Michel Daenzer [Tue, 26 Aug 2003 16:49:33 +0000 (16:49 +0000)]
Rename agp to gart for radeon
Michel Daenzer [Tue, 26 Aug 2003 15:44:01 +0000 (15:44 +0000)]
Remove artificial PCI GART limitations, rename AGP to GART where
appropriate
Eric Anholt [Tue, 19 Aug 2003 02:22:57 +0000 (02:22 +0000)]
Fix the debug build.
Eric Anholt [Tue, 19 Aug 2003 00:41:00 +0000 (00:41 +0000)]
- Remove $FreeBSD$ tags as they weren't too useful and merges are now being
done through perforce.
- Add copyright headers to drm_os_*bsd.h, still need to research the other
copyright-less files better.
Michel Daenzer [Mon, 18 Aug 2003 23:46:19 +0000 (23:46 +0000)]
Clean up Radeon DRI resume code
Eric Anholt [Mon, 18 Aug 2003 23:42:16 +0000 (23:42 +0000)]
Make r128_do_wait_for_idle static, as it's only used in this file.
Noticed by: CScout
Eric Anholt [Mon, 18 Aug 2003 23:41:05 +0000 (23:41 +0000)]
Remove an unnecessary #define __NO_VERSION__
Noticed by: CScout
Michel Daenzer [Fri, 15 Aug 2003 10:31:54 +0000 (10:31 +0000)]
Merge from 2.6 kernel (Linus Torvalds)
Dave Airlie [Fri, 15 Aug 2003 01:05:24 +0000 (01:05 +0000)]
DA: loads of whitespace .. some from Linus, some from me
Dave Airlie [Wed, 13 Aug 2003 23:35:40 +0000 (23:35 +0000)]
DA: patch from Matthew upgraded to latest DRI head to solve issue with i810
compatibility
Eric Anholt [Tue, 12 Aug 2003 21:48:16 +0000 (21:48 +0000)]
Whitespace cleanup from the pageflipping commit.
Eric Anholt [Tue, 12 Aug 2003 21:47:34 +0000 (21:47 +0000)]
Document change in interface version 1.9.
Eric Anholt [Tue, 12 Aug 2003 21:34:03 +0000 (21:34 +0000)]
Document the changes in interface version 2.5.
Eric Anholt [Tue, 12 Aug 2003 21:18:05 +0000 (21:18 +0000)]
Merge from FreeBSD r1.11: We have memset in the kernel, no need to define
it to bzero (which it was always used for).
Dave Airlie [Mon, 11 Aug 2003 01:46:02 +0000 (01:46 +0000)]
DA: code cleanups for i810_dma.c from 2.4 kernel
Ian Romanick [Fri, 8 Aug 2003 21:06:44 +0000 (21:06 +0000)]
Added some information as to when (which DRM version) various queries were
added.
Michel Daenzer [Thu, 7 Aug 2003 10:13:50 +0000 (10:13 +0000)]
build fix for kernels >= 2.6
Michel Daenzer [Wed, 6 Aug 2003 11:46:21 +0000 (11:46 +0000)]
Fix maplist entries being used after they were freed; thanks to Benjamin
Herrenschmidt for tracking this down
Michel Daenzer [Tue, 29 Jul 2003 10:11:48 +0000 (10:11 +0000)]
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Michel Daenzer [Sat, 26 Jul 2003 15:59:09 +0000 (15:59 +0000)]
Degrade uninformative error message to debug message, as in other drivers
Eric Anholt [Sat, 26 Jul 2003 03:25:40 +0000 (03:25 +0000)]
Add Rage 128 pageflipping support, defaults to off. DRM version bump to
2.5.0. It still has some issues, including a flicker in the fps meter
in tuxracer and I've seen garbage left behind after moving/closing
windows. However, it's usable. Add the Option "EnablePageFlip" "YES" to
use it.
Eric Anholt [Sat, 26 Jul 2003 03:18:34 +0000 (03:18 +0000)]
Fix FreeBSD build after IRQ changes.
Michel Daenzer [Fri, 25 Jul 2003 10:50:39 +0000 (10:50 +0000)]
Compile fixes for recent 2.5/2.6 Linux kernels. I hope this doesn't break
the i830 driver or the BSDs. :)
Michel Daenzer [Fri, 25 Jul 2003 10:31:37 +0000 (10:31 +0000)]
Fail in DRM(agp_acquire) if the AGP aperture can't be used, such that the X
server falls back to PCI GART or disables the DRI gracefully
Keith Whitwell [Fri, 11 Jul 2003 15:27:55 +0000 (15:27 +0000)]
Restore __HAVE_KERNEL_CTX_SWITCH, required for the sparc drm module in the
kernel tree. Added comments to that effect.
Dave Airlie [Wed, 9 Jul 2003 23:21:15 +0000 (23:21 +0000)]
DA: fix for bug 484 in Bugzilla, originally from me, reworked by David
Dawes to avoid backword incompatibilities...
Jose Fonseca [Wed, 9 Jul 2003 09:28:42 +0000 (09:28 +0000)]
file drm_mem.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Wed, 9 Jul 2003 09:26:17 +0000 (09:26 +0000)]
file drm_dma.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Wed, 9 Jul 2003 09:26:17 +0000 (09:26 +0000)]
file drm_fops.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Wed, 9 Jul 2003 09:26:17 +0000 (09:26 +0000)]
file drm_lock.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Wed, 9 Jul 2003 09:26:17 +0000 (09:26 +0000)]
file drm_stub.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Wed, 9 Jul 2003 09:26:17 +0000 (09:26 +0000)]
file drm_vm.c was initially added on branch newdrm-0-0-1-branch.
Keith Whitwell [Tue, 8 Jul 2003 17:10:13 +0000 (17:10 +0000)]
Removed unused __HAVE_KERNEL_CTX_SWITCH, whatever that was.
Leif Delgass [Fri, 4 Jul 2003 18:31:42 +0000 (18:31 +0000)]
Don't need to include linux/wrapper.h - we only use Set/ClearPageReserved
from linux/mm.h now and wrapper.h has been removed in 2.5.69 and later.
Jose Fonseca [Tue, 1 Jul 2003 18:56:57 +0000 (18:56 +0000)]
file drm_agp.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Tue, 1 Jul 2003 18:56:57 +0000 (18:56 +0000)]
file drm_bufs.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Tue, 1 Jul 2003 18:56:57 +0000 (18:56 +0000)]
file drm_mem.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Tue, 1 Jul 2003 18:56:57 +0000 (18:56 +0000)]
file drm_pci.c was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Tue, 1 Jul 2003 18:56:57 +0000 (18:56 +0000)]
file drm_sg.c was initially added on branch newdrm-0-0-1-branch.
Alan Hourihane [Mon, 23 Jun 2003 16:34:14 +0000 (16:34 +0000)]
file savage_dma.c was initially added on branch savage-1_0_0-branch.
Alan Hourihane [Mon, 23 Jun 2003 16:34:14 +0000 (16:34 +0000)]
file savage_state.c was initially added on branch savage-1_0_0-branch.
Jose Fonseca [Sat, 21 Jun 2003 15:27:51 +0000 (15:27 +0000)]
file drm_pci_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Sat, 21 Jun 2003 14:01:43 +0000 (14:01 +0000)]
file drm_stub_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Sat, 21 Jun 2003 13:18:47 +0000 (13:18 +0000)]
file drm_memory_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Sat, 21 Jun 2003 13:09:08 +0000 (13:09 +0000)]
file drm_vm_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Sat, 21 Jun 2003 12:49:34 +0000 (12:49 +0000)]
file drm_dma_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Sat, 21 Jun 2003 12:27:27 +0000 (12:27 +0000)]
file drm_lock_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Thu, 19 Jun 2003 00:14:25 +0000 (00:14 +0000)]
file drm_bufs_tmp.h was initially added on branch newdrm-0-0-1-branch.
Jose Fonseca [Thu, 19 Jun 2003 00:09:52 +0000 (00:09 +0000)]
Revert the janitorial - that works is now on the new branch
newdrm-0-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_compat.c was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830.h was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_dma.c was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_drm.h was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_drv.c was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_drv.h was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_irq.c was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Wed, 18 Jun 2003 15:07:31 +0000 (15:07 +0000)]
file i830_mem.c was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Mon, 16 Jun 2003 10:40:52 +0000 (10:40 +0000)]
Possibly fix stanford checker complaints about sarea
Jose Fonseca [Sat, 14 Jun 2003 15:18:49 +0000 (15:18 +0000)]
Move the linux AGP includes into drm_agp.h and only define the AGP data
structures if AGP support is enabled in the kernel (__REALLY_HAVE_AGP).
This fixes the compile errors on kernels without AGP support.
Keith Whitwell [Tue, 10 Jun 2003 18:54:17 +0000 (18:54 +0000)]
Texture rectangle support for r100
Keith Whitwell [Mon, 9 Jun 2003 23:12:33 +0000 (23:12 +0000)]
Revert bogus last commit
Keith Whitwell [Mon, 9 Jun 2003 23:11:23 +0000 (23:11 +0000)]
Don't activate blend fallbacks unless blending is enabled
Jose Fonseca [Sat, 7 Jun 2003 12:45:55 +0000 (12:45 +0000)]
Verify 'drm_agp' is not NULL for all its wrappers - this causes no overhead
and must be done if in future a driver tries to talk to the AGP
directly from kernelspace instead of userspace, and the AGP is not
present.
Jose Fonseca [Sat, 7 Jun 2003 12:30:22 +0000 (12:30 +0000)]
Check that the AGPGART "drm_agp" symbol pointer is valid before
initializing the DRM device - this was causing a kernel oops when the
AGPGART module wasn't loaded.
Dave Airlie [Sat, 7 Jun 2003 01:44:15 +0000 (01:44 +0000)]
fix pitch compile error
Dave Airlie [Thu, 5 Jun 2003 23:31:40 +0000 (23:31 +0000)]
add page flipping support to the DRM, up version number to 1.3.0...
Jose Fonseca [Tue, 3 Jun 2003 23:50:23 +0000 (23:50 +0000)]
Added the Doxygen configuration file. Minor documentation fixes.
Jose Fonseca [Tue, 3 Jun 2003 23:27:01 +0000 (23:27 +0000)]
Split declarations/definitions in drm_scatter.h into drm_sg.h/drm_sg_tmp.h
respectively. Splited the work out of the ioctls and renamed (with the
_ioctl prefix). Added some more documentation. Did the same for
drm_sgpsupport.h.
Keith Whitwell [Tue, 3 Jun 2003 11:23:58 +0000 (11:23 +0000)]
file i830_mem.c was initially added on branch i865-agp-0-1-branch.
Keith Whitwell [Fri, 30 May 2003 12:07:45 +0000 (12:07 +0000)]
file i830_compat.c was initially added on branch i865-agp-0-1-branch.
Leif Delgass [Wed, 28 May 2003 02:03:37 +0000 (02:03 +0000)]
Restore change to _DRM_VBLANK_SIGNAL from rev. 1.41, which was reverted
with the documentation merge.
Leif Delgass [Wed, 28 May 2003 01:44:49 +0000 (01:44 +0000)]
Restore DRM_*MEMORYBARRIER change reverted with documentation merge
Jose Fonseca [Tue, 27 May 2003 00:37:33 +0000 (00:37 +0000)]
Merged DRM documentation.
Leif Delgass [Mon, 26 May 2003 20:04:53 +0000 (20:04 +0000)]
Add support to r128 for MESA_ycbcr_texture (Ian Romanick, Leif Delgass)
David Dawes [Tue, 20 May 2003 22:43:39 +0000 (22:43 +0000)]
DRM part of Radeon DRI suspend/resume support (Charl Botha).
David Dawes [Tue, 20 May 2003 22:42:24 +0000 (22:42 +0000)]
Support for building DRM module on OpenBSD (Wilbern Cobb, Matthieu Herrb).
(resync with XFree86 trunk)
Michel Daenzer [Sat, 17 May 2003 00:37:34 +0000 (00:37 +0000)]
do allow reading from read only mappings...
Michel Daenzer [Fri, 16 May 2003 23:41:27 +0000 (23:41 +0000)]
Support AGP bridges where the AGP aperture can't be accessed directly by
the CPU (David Mosberger, Benjamin Herrenschmidt, myself, Paul
Mackerras, Jeff Wiedemeier)
Michel Daenzer [Tue, 6 May 2003 21:10:33 +0000 (21:10 +0000)]
fix warning on machines where sizeof(drm_addr_t) != 4 (Randy Dunlap)
Ian Romanick [Wed, 30 Apr 2003 01:51:00 +0000 (01:51 +0000)]
Merged texmem-0-0-1
Leif Delgass [Tue, 29 Apr 2003 16:59:00 +0000 (16:59 +0000)]
remove unused variables
Eric Anholt [Mon, 28 Apr 2003 23:18:43 +0000 (23:18 +0000)]
Fix a typo: On takedown the mtrr operation is MEMRANGE_SET_REMOVE, not
_UPDATE.
Leif Delgass [Mon, 28 Apr 2003 17:49:26 +0000 (17:49 +0000)]
Restore Eric Anholt's DRM_*MEMORYBARRIER changes from rev 1.11
Leif Delgass [Mon, 28 Apr 2003 16:20:31 +0000 (16:20 +0000)]
Only free original pagelist in addbufs_pci if one already exists (fixes
oops).
Alan Hourihane [Mon, 28 Apr 2003 15:29:46 +0000 (15:29 +0000)]
DRM_READ/WRITEMEMORYBARRIER was given an argument in the bsd tree, fix for
linux
Keith Whitwell [Sun, 27 Apr 2003 09:53:58 +0000 (09:53 +0000)]
Put back __HAVE_KERNEL_CTX_SWITCH for David Miller's sparc drm driver
(which doesn't live in our cvs).
Eric Anholt [Sun, 27 Apr 2003 00:43:14 +0000 (00:43 +0000)]
Use real endian conversion functions.
Eric Anholt [Sat, 26 Apr 2003 23:55:30 +0000 (23:55 +0000)]
Fix formatting of hw.dri sysctl.
Eric Anholt [Sat, 26 Apr 2003 23:32:00 +0000 (23:32 +0000)]
Remove the map argument from DRM_*MEMORYBARRIER. Not all of the uses of
DRM_*MEMORYBARRIER we had were related to an MMIO space. This means
arch-specific code on the BSDs, unfortunately. Also add
DRM_MEMORYBARRIER() and change the DRM_READMEMORYBARRIER()s that used
to be read/write barriers to it.