summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2003-11-03Add i852/i855 PCI ID. Also fix whitespace in the other ID definitions.Eric Anholt
2003-10-27Add a DRM_PUT_USER_UNCHECKED, which will be used by an upcoming radeonEric Anholt
change.
2003-10-24Don't try to use dev->dma_lock unless dma is initialized (dev->dma != NULL)Eric Anholt
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).
2003-10-24Switch pci enumeration call to work on both 2.4 and 2.6 pci_for_each_dev isJon Smirl
not supported on 2.6
2003-10-24Move the REALLY_HAVE_AGP endif above the mtrr functions. Broke tdfx module.Eric Anholt
2003-10-23Move to "old-style" probing as documented in linux/Documentation/pci.txt.Eric Anholt
This should resolve the probe problems with radeon framebuffer due to pci_driver attachment being exclusive.
2003-10-23Missed the sis.h header in Makefile.linux in the move to shared/.Eric Anholt
2003-10-23The SiS300 pci id also covers the 305, so make the name reflect that.Eric Anholt
2003-10-23- Introduce a new ioctl, DRM_IOCTL_SET_VERSION. This ioctl allows theEric Anholt
server or client to notify the DRM that it expects a certain version of the device dependent or device independent interface. If the major doesn't match or minor is too large, EINVAL is returned. A major of -1 means that the requestor doesn't care about that portion of the interface. The ioctl returns the actual versions in the same struct. - Introduce DRM DI interface version 1.1. If the server requests version 1.1, then the DRM sets the unique itself according to the busid of the device it probed, which may then be accessed as normal using getunique. - Request version 1.1 in libdrm's drmOpenByBusID, allowing the X Server to request based on a BusID. Introduce a wrapper for DRM_IOCTL_SET_VERSION and bump libdrm minor version. - Pass the busid in DRIScreenInit if libdrm can handle both a busid and name. This allows drmOpenByBusID to be used to find the DRM instead of just the driver name, which allows us in the future to tie a DRM more strongly to the device it probed to. Introduce a function DRICreatePCIBusID which creates a busid in the form pci:oooo:bb:dd.f similar to linux's pci_name() function. This matches the format used by the DRM in version 1.1. libdrm knows how to match both this format and the old PCI:b:d:f format. - Use the new DRICreatePCIBusID function in the *_dri.c to request the new, more exact busid format.
2003-10-22- Add DRM_GET_PRIV_WITH_RETURN macro. This can be used in shared code toEric Anholt
get the drm_file_t * based on the filp passed in ioctl handlers. - Use this macro on BSD for simplification and improve its error reporting. Make failure to find the drm_file_t * print as an error, not debug. This failure may be part of the problem with KDE. - Make debug and error print macros include the pid on BSD.
2003-10-22Fix warning about static DRM(bufs_info) defined but not used in theEric Anholt
!__HAVE_DMA case.
2003-10-20Fix the possibility of sleeping with locks held in sysctls by copying theEric Anholt
data into temporary variables with the lock held then outputting to sysctls with the lock released. Rearranged a little extra code to aid this. Note that drm_memory_debug.h hasn't had this fix applied, but I consider that code to be just about dead anyway.
2003-10-20Clean up BSD MTRR handling. The NetBSD code is untested, but it's my bestEric Anholt
shot.
2003-10-19- SMPng lock the DRM. This is only partial -- there are a few code pathsEric Anholt
used by root (the X Server) which are not locked. However, it should deal with lost-IRQ issues on -current which I think people have been experiencing but I am unable to reproduce (though I understand why they would occur, because of a bug of mine). Note that most of the locking (DRM_LOCK()/UNLOCK()) is all covered by Giant still, so it doesn't matter yet. - Remove locking on FreeBSD-stable and NetBSD. These are covered by the fact that there is no reentrancy of the kernel except by interrupts, which are locked using spldrm()/splx() instead.
2003-10-19Clean up extra zeroing of dev->dma, and use calloc to take advantage ofEric Anholt
M_ZERO.
2003-10-19Fix probing on 2.5+ kernels, which require that drivers have .id_table set.Eric Anholt
We use PCI_ANY_ID to ask that our probe is called for every available device. Submitted by: jonsmirl
2003-10-17- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle themEric Anholt
from __HAVE_DMA. This will be useful for adding vblank sync support to sis and tdfx. Rename dma_service to irq_handler, which is more accurately what it is. - Fix the #if _HAVE_DMA_IRQ in radeon, r128, mga, i810, i830, gamma to have the right number of underscores. This may have been a problem in the case that the server died without doing its DRM_IOCTL_CONTROL to uninit.
2003-10-17- Converted Linux drivers to initialize DRM instances based on PCI IDs, notEric Anholt
just a single instance. Moved the PCI ID lists from <card>_drv.c in BSD to <card>.h. The PCI ID lists include a driver private field, which may be used by drivers for chip family or other information. Based on work by jonsmirl. - Make tdfx_drv.c and tdfx.h match other drivers. - Fixed up linking of sis shared files. Tested with Radeon and SiS on Linux and FreeBSD, including a Linux setup with 2 SiS cards in a machine, but only one head being used (with DRI)
2003-10-16Introduce COMMIT_RING() as in radeon DRM, stop using error prone writebackMichel Daenzer
for ring read pointer (Paul Mackerras) Get rid of some superfluous stuff, minor fixes
2003-10-16Try that again. It's a long.Eric Anholt
2003-10-16Debug printf format fix.Eric Anholt
2003-10-03Some code cleanups done while working on locking. Reduces always-trueEric Anholt
tests, excessive indenation, convoluted handling of errors, or code duplication.
2003-10-03Stylistic preparation for SMPng locking work: DRM_LOCK/DRM_UNLOCK have sideEric Anholt
effects, so make them look like functions (add parenthesis).
2003-10-02Add an MIT-style copyright, assigned to myself, to these files. I thinkEric Anholt
I've touched enough of the code here, and there was no previous copyright. Do some drive-by style fixes while I'm here.
2003-10-02Axe more old gamma DMA infrastructure.Eric Anholt
2003-10-02Mostly whitespace cleanups and style(9) fixes focused on "if(" -> "if ("Eric Anholt
Change some nearby memset()s to bzero()s or to calloc allocations to take advantage of M_ZERO). Reverse some error tests to reduce high levels of indentation. Move the sg_cleanup() call out of the maplist loop in DRM(takedown)-- I can't see any need for it to be inside.
2003-10-02Wrap sys/endian.h usage with __FreeBSD_version >= 480000.Eric Anholt
Obtained from: i865-agp-0-1-branch
2003-10-02Allow the DRM to attach to a "drmsub" device. This will be provided by theEric Anholt
i810 AGP module, working around the limitation of one driver per device. Obtained from: i865-0-1-branch
2003-10-02MTRR issue with SMP and -stable seems to be resolved. Re-enable MTRRs onEric Anholt
4.x
2003-09-30file via_drm.h was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via.h was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_drv.c was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_drv.h was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_ds.c was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_ds.h was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_map.c was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_mm.c was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-30file via_mm.h was initially added on branch cle266-0-0-1-branch.Jose Fonseca
2003-09-28Fix typo in SiS help message (and testing cvs commit toLeif Delgass
dri.freedesktop.org)
2003-09-25Whitespace cleanup (spaces before tabs or instead of tabs).Eric Anholt
2003-09-25Whitespace cleanup.Eric Anholt
Submitted by: Linus Torvalds <torvalds@osdl.org>
2003-09-25Fix Kconfig for SiS DRM now that it doesn't require sisfb.Eric Anholt
Submitted by: Linus Torvalds <torvalds@osdl.org>
2003-09-24post merge fixAlan Hourihane
2003-09-13compatibility layer still uses agp (not gart)Alan Hourihane
2003-09-12bsd drm fixesAlan Hourihane
2003-09-12linux drm fixesAlan Hourihane
2003-09-12resolve merge conflictsAlan Hourihane
2003-09-09Use spldrm/splx around tsleep() in DRM_WAIT_ONKeith Whitwell
2003-09-07Correct format in debug printfs (free is a pointer, not an int).Eric Anholt
2003-09-07Fix for older -stable.Eric Anholt
Obtained from: FreeBSD CVS