summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master' into i915-zone-renderingi915-zone-renderingMichel Dänzer2007-09-07262-10116/+20270
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: linux-core/drm_bo.c linux-core/drm_objects.h linux-core/i915_buffer.c shared-core/i915_dma.c shared-core/i915_drm.h shared-core/i915_drv.h shared-core/i915_irq.c
| * nouveau: Use nv41 ctxprog/vals on nv42.Ben Skeggs2007-09-071-1/+3
| |
| * Merge branch 'xgi-0-0-2'Ian Romanick2007-09-0616-2/+2138
| |\
| | * Bump version to 1.0.0.Ian Romanick2007-09-061-3/+3
| | |
| | * Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into ↵Ian Romanick2007-08-3169-1615/+5769
| | |\ | | | | | | | | | | | | xgi-0-0-2
| | * | Acutally emit the IRQ (duh) when setting the fence post.Ian Romanick2007-08-311-1/+3
| | | |
| | * | Use ati_pcigart for PCI-e GART table handling.Ian Romanick2007-08-293-64/+30
| | | |
| | * | Fix late night dumb-dumb mistake.Ian Romanick2007-08-291-1/+1
| | | |
| | * | Use DRM_SPINLOCK / DRM_UNSPINLOCK macros.Ian Romanick2007-08-293-6/+6
| | | |
| | * | Remove unnecessary include.Ian Romanick2007-08-171-1/+0
| | | |
| | * | Forgot to add this file on the last commit.Ian Romanick2007-08-161-0/+125
| | | |
| | * | Implement fence support.Ian Romanick2007-08-156-18/+103
| | | |
| | * | Eliminate unused / useless ioctls.Ian Romanick2007-08-145-93/+4
| | | |
| | * | Clean up remaining C++ style comments.Ian Romanick2007-08-141-10/+18
| | | |
| | * | Move dwWriteReg to xgi_cmdlist.c, the only file where it is used.Ian Romanick2007-08-142-13/+14
| | | |
| | * | Remove unused interrupt related functions.Ian Romanick2007-08-141-24/+0
| | | |
| | * | Clean up xgi_(en|dis)able_(mmio|ge) and move to xgi_misc.c.Ian Romanick2007-08-143-110/+171
| | | |
| | * | Strobe magic 0xB03F register to flush PCI-e GART table.Ian Romanick2007-08-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original XGI kernel driver strobed 0xB03F each time a page was allocated to back a GART page. When the driver was converted to use the DRM SG interface, this code was lost. Returning it fixes a long standing issue where the X-server would work fine the first time, but acceleration commands would be ignored on the second X-server invocation.
| | * | After calling drm_sman_cleanup, mark both heaps as uninitialized.Ian Romanick2007-08-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since the heaps weren't marked as uninitialized, SG memory was never re-allocated. This prevented the X-server from being able to restart without re-loading the kernel module.
| | * | Use DRM_MEMORYBARRIER() macro instead of mb().Ian Romanick2007-08-091-5/+1
| | | |
| | * | Mask off correct bits in M2REG_AUTO_LINK_STATUS for interrupt handling.Ian Romanick2007-08-093-35/+64
| | | |
| | * | Minor clean up of IRQ code. Much, much more to come.Ian Romanick2007-08-092-20/+9
| | | |
| | * | Use sman memory manager instead of internal version.Ian Romanick2007-08-094-313/+54
| | | |
| | * | Unify alloc and free ioctls.Ian Romanick2007-08-095-75/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DRM_XGI_PCIE_ALLOC and DRM_XGI_FB_ALLOC ioctls (and the matching free ioctls) are unified to DRM_XGI_ALLOC. The desired memory region is selected by xgi_mem_alloc::location. The region is magically encoded in xgi_mem_alloc::index, which is used to release the memory. Bump to version 0.11.0. This update requires a new DDX.
| | * | Associate master file pointer with command list buffer.Ian Romanick2007-08-094-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the master's file pointer, as supplied to xgi_bootstrap, to xgi_cmdlist_initialize. Associate that pointer with the memory allocated for the command list buffer. By doing this the memory will be automatically cleaned up when the master closes the device. This allows the removal of some clean up code.
| | * | Unify infrastructure for freeing on-card / GART memory.Ian Romanick2007-08-064-32/+15
| | | |
| | * | Release client memory in reclaim_buffers_idlelocked instead of preclose.Ian Romanick2007-08-061-14/+20
| | | |
| | * | Refactor xgi_(fb|pcie)_free_all into xgi_free_all.Ian Romanick2007-08-064-44/+13
| | | |
| | * | Replace per-heap semaphores with drm_device::struct_mutex.Ian Romanick2007-08-064-16/+10
| | | |
| | * | Unify infrastructure for allocating (not yet freeing) on-card / GART memory.Ian Romanick2007-08-064-43/+18
| | | |
| | * | Eliminate unnecessary function xgi_pcie_free_locked.Ian Romanick2007-08-061-12/+2
| | | |
| | * | Finish removing allocation "owner" infrastructure.Ian Romanick2007-08-061-12/+1
| | | |
| | * | Eliminate special-case handling of framebuffer (fake) allocation.Ian Romanick2007-08-062-33/+20
| | | |
| | * | Eliminate allocation "owner" usage.Ian Romanick2007-08-064-50/+6
| | | |
| | * | Refactor register dumping code.Ian Romanick2007-07-311-148/+35
| | | |
| | * | Move additional GE initialization into the kernel.Ian Romanick2007-07-301-0/+52
| | | | | | | | | | | | | | | | This code comes directly from the X server.
| | * | Fix GE shut-down sequence.Ian Romanick2007-07-302-24/+48
| | | | | | | | | | | | | | | | | | | | | | | | When the GE is shut down, an empty command packet without a begin-link must be sent. After this command is sent, wait for the hardware to go idle. Finally, turn off the GE and disable MMIO.
| | * | Use DRM_READ/DRM_WRITE macros instead of directly accessing MMIO space.Ian Romanick2007-07-301-51/+68
| | | |
| | * | Use OUT3C5B macro instead of assuming little-endian byte order.Ian Romanick2007-07-301-1/+1
| | | |
| | * | Convert to new ioctl interface between core DRM and device-specific module.Ian Romanick2007-07-276-144/+101
| | | |
| | * | Eliminate use of DRM_ERR.Ian Romanick2007-07-264-16/+16
| | | |
| | * | Eliminate unnecessary (and now wrong) call gto drm_sg_free.Ian Romanick2007-07-261-4/+0
| | | |
| | * | Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into ↵Ian Romanick2007-07-26218-7537/+8247
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xgi-0-0-2 Conflicts: linux-core/drmP.h linux-core/drm_scatter.c
| | * | | Fix typo on previous commit. Sigh...Ian Romanick2007-07-241-1/+1
| | | | |
| | * | | Pass correct offset to xgi_find_pcie_virt.Ian Romanick2007-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The wrong offset was being passed to xgi_find_pcie_virt. This would cause an oops in addFlush2D.
| | * | | Fix license formatting.Ian Romanick2007-07-249-214/+196
| | | | |
| | * | | Fix flags for serveral ioctls.Ian Romanick2007-07-241-2/+2
| | | | |
| | * | | Fix bug preventing X server from restarting.Ian Romanick2007-07-243-45/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The core DRM lastclose routine automatically destroys all mappings and releases SG memory. XP10 DRM and DDX assumed this data stayed around until module unload. xgi_bootstrap was reworked to recreate all these mappings. In addition, the drm_addmap for the GART backing store was moved into the kernel. This causes a change to the ioctl protocol and a version bump.
| | * | | Minor log message clean up.Ian Romanick2007-07-231-1/+2
| | | | |
| | * | | Minor log message clean up.Ian Romanick2007-07-231-8/+5
| | | | |