summaryrefslogtreecommitdiff
path: root/bsd
AgeCommit message (Collapse)AuthorFilesLines
2003-11-12Fix a locking nit, and add asserts in some things that should be callednewmesa-0-0-1-20031209driinterface-0-0-1-branchEric Anholt4-7/+12
with locks held.
2003-11-06Return EBUSY when attempting to addmap a DRM_SHM area with a lock in it ifEric Anholt1-0/+10
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.
2003-11-06Remove unused variable.Eric Anholt1-1/+0
2003-11-05- Tie the DRM to a specific device: setunique no longer succeeds when givenEric Anholt4-112/+131
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.
2003-11-05Args for the BSD DRM_PUT_USER_UNCHECKED were swapped.Eric Anholt1-1/+1
2003-11-05Repo-copy linux/drm/kernel/drm.h to shared/drm/kernel/drm.h and use it onEric Anholt2-479/+1
both Linux and *BSD.
2003-11-05Remove buf_alloc which is unused since the locking commit.Eric Anholt2-2/+0
2003-11-04Memory layout transition:Michel Daenzer5-0/+13
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.
2003-10-27Add a DRM_PUT_USER_UNCHECKED, which will be used by an upcoming radeonEric Anholt1-0/+2
change.
2003-10-24Don't try to use dev->dma_lock unless dma is initialized (dev->dma != NULL)Eric Anholt1-2/+1
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-24Move the REALLY_HAVE_AGP endif above the mtrr functions. Broke tdfx module.Eric Anholt1-1/+1
2003-10-23- Introduce a new ioctl, DRM_IOCTL_SET_VERSION. This ioctl allows theEric Anholt4-3/+81
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 Anholt5-30/+44
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 Anholt1-0/+2
!__HAVE_DMA case.
2003-10-20Fix the possibility of sleeping with locks held in sysctls by copying theEric Anholt5-104/+142
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 Anholt6-96/+90
shot.
2003-10-19- SMPng lock the DRM. This is only partial -- there are a few code pathsEric Anholt13-236/+235
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 Anholt1-8/+2
M_ZERO.
2003-10-17- Move IRQ functions from drm_dma.h to new drm_irq.h and disentangle themEric Anholt7-236/+268
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 Anholt11-199/+22
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-03Some code cleanups done while working on locking. Reduces always-trueEric Anholt2-131/+106
tests, excessive indenation, convoluted handling of errors, or code duplication.
2003-10-03Stylistic preparation for SMPng locking work: DRM_LOCK/DRM_UNLOCK have sideEric Anholt10-82/+82
effects, so make them look like functions (add parenthesis).
2003-10-02Add an MIT-style copyright, assigned to myself, to these files. I thinkEric Anholt2-7/+53
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 Anholt1-22/+0
2003-10-02Mostly whitespace cleanups and style(9) fixes focused on "if(" -> "if ("Eric Anholt5-153/+129
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 Anholt1-0/+8
Obtained from: i865-agp-0-1-branch
2003-10-02Allow the DRM to attach to a "drmsub" device. This will be provided by theEric Anholt1-4/+16
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 Anholt1-1/+1
4.x
2003-09-12bsd drm fixesAlan Hourihane1-4/+4
2003-09-12resolve merge conflictsAlan Hourihane1-5/+2
2003-09-09Use spldrm/splx around tsleep() in DRM_WAIT_ONtrunk-20030912Keith Whitwell1-5/+7
2003-09-07Fix for older -stable.Eric Anholt1-1/+2
Obtained from: FreeBSD CVS
2003-08-29These files were missed in the SiS DRM commit.Eric Anholt2-0/+82
2003-08-29Port the SiS DRM to FreeBSD. This includes the ability for the DRM toEric Anholt4-2/+16
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.
2003-08-29Add DRM(calloc), which is convenient, used by the new sis code, and takesEric Anholt2-0/+6
advantage of M_ZERO on BSDs.
2003-08-29Update radeon PCI IDs.Eric Anholt1-4/+4
2003-08-29This PCI header has been living in dev/pci/ for a while now.Eric Anholt1-1/+1
2003-08-19Fix the debug build.Eric Anholt1-1/+1
2003-08-19- Remove $FreeBSD$ tags as they weren't too useful and merges are now beingEric Anholt27-32/+67
done through perforce. - Add copyright headers to drm_os_*bsd.h, still need to research the other copyright-less files better.
2003-08-12Merge from FreeBSD r1.11: We have memset in the kernel, no need to defineEric Anholt1-3/+1
it to bzero (which it was always used for).
2003-07-29IRQ code cleanup suggested by Linus TorvaldsMichel Daenzer4-8/+8
i830 build fix
2003-07-26Fix FreeBSD build after IRQ changes.Eric Anholt1-2/+2
2003-07-25Compile fixes for recent 2.5/2.6 Linux kernels. I hope this doesn't breakMichel Daenzer4-2/+8
the i830 driver or the BSDs. :)
2003-05-20Support for building DRM module on OpenBSD (Wilbern Cobb, Matthieu Herrb).David Dawes1-1/+1
(resync with XFree86 trunk)
2003-05-16Support AGP bridges where the AGP aperture can't be accessed directly byMichel Daenzer2-4/+4
the CPU (David Mosberger, Benjamin Herrenschmidt, myself, Paul Mackerras, Jeff Wiedemeier)
2003-04-28Fix a typo: On takedown the mtrr operation is MEMRANGE_SET_REMOVE, notEric Anholt1-1/+1
_UPDATE.
2003-04-27Use real endian conversion functions.Eric Anholt2-2/+6
2003-04-26Fix formatting of hw.dri sysctl.Eric Anholt3-24/+16
2003-04-26Remove the map argument from DRM_*MEMORYBARRIER. Not all of the uses ofEric Anholt3-10/+32
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.
2003-04-26MFL: Don't install irq handler unless the driver has been initialized.Eric Anholt1-0/+3
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 13:02:40 +0000