summaryrefslogtreecommitdiff
path: root/linux
AgeCommit message (Expand)Author
2000-09-22Import of XFree86 4.0.1d-preAlan Hourihane
2000-09-19Make management of current->state more correct.Rik Faith
2000-09-19Make management of current->state correct (accidentally made incorrect whenRik Faith
2000-09-19Correct sync with 2.4.0-test9-pre4 kernel.Gareth Hughes
2000-09-19Sync with 2.4.0-test9-pre4 kernel.Gareth Hughes
2000-09-14axp cast fix.Alan Hourihane
2000-09-13Remove debugging statement from production code.Rik Faith
2000-09-13Fix for [Bug #112247] Hard MGA lock with trispd -size 50000Rik Faith
2000-09-10Sync with 2.4.0-test8 kernel.Gareth Hughes
2000-09-07Merge of tdfx branch undid the changes from the 2.4.0-test8-pre5 kernelGareth Hughes
2000-09-07Merged tdfx-2-1-branchAlan Hourihane
2000-09-06Sync with 2.4.0-test8-pre5 kernel.Gareth Hughes
2000-08-31Bump version number after kernel interface change.Keith Whitwell
2000-08-31Pre Linux 2.4.0 compatibility header fileRik Faith
2000-08-30Initialize vertsize correctly. Add planemask arguments for color and depthKeith Whitwell
2000-08-28Add compatibility header file to make Linux 2.4.0 kernel patches cleaner.Rik Faith
2000-08-26Sync with Linux 2.4.0-test7 Add signal blocking support to all driversRik Faith
2000-08-25Apply patch from Alan Hourihane to temporarily allow compilation on AlphaRik Faith
2000-08-25Remove misleading authorship information from sis driver (author has beenRik Faith
2000-08-25Improve detection of kill_fasync parameter count Make compilation of sis.oRik Faith
2000-08-20Bug fixes for 32bpp rendering (still disabled)Keith Whitwell
2000-08-18Possible fix for trispd bugJeff Hartmann
2000-08-18Fix ABA problem in drm_freelist_{put,try}Rik Faith
2000-08-18Sync with Linux 2.4.0-test7/pre4Rik Faith
2000-08-17Bug #112196: auth.c uses semaphores while holding spinlocks Make spinlockedRik Faith
2000-08-17Bug #112197 Made sis driver compile under 2.4.0-test7/pre4Rik Faith
2000-08-16Fix for bug #111744 which caused any application to never render and dma toJeff Hartmann
2000-08-16first part of 4.0.1b mergeDavid Dawes
2000-08-16Initial revisionDavid Dawes
2000-08-08Sync with Linux 2.4.0-test6-pre8Rik Faith
2000-08-07Fix for multiple sarea bug + agp built into kernel segfaultJeff Hartmann
2000-08-04Sync with Linux 2.4.0-test6-pre2Rik Faith
2000-07-22Fix typoRik Faith
2000-07-22Move to new, denser, easier-to-read Linux kernel Makefile formatRik Faith
2000-07-21Revert some changes and try alternative way to clean up AGP handling.Rik Faith
2000-07-21Revert some changes and try alternative way to clean up AGP handling.Rik Faith
2000-07-21Fixes for building in the kernel treeRik Faith
2000-07-21Changes to make AGP optional for in-kernel buildsRik Faith
2000-07-20kfree_s was deprecated in 2.4.0-test?Rik Faith
2000-07-20More fixups for kernel build: EXPORT_SYMTAB warning removalRik Faith
2000-07-20Fixes for building in the kernel treeRik Faith
2000-07-20Fixed for monolithic kernel buildRik Faith
2000-07-20Fix signature for *_options functionRik Faith
2000-07-20Added support for building as modules or as part of monolithic kernelRik Faith
2000-07-19Bump driver dates and add descriptionsRik Faith
2000-07-19Allow SAREA > 1 page in sizeRik Faith
2000-07-19Sync with Linux 2.4.0-test4 kernelRik Faith
2000-07-13applied Jeff's xf86cvs-I810copy.patchBrian Paul
2000-07-11Merge XFree86 4.0.1Alan Hourihane
2000-07-10Import of XFree86 4.0.1Alan Hourihane
an class="hl kwa">return NULL; dmah->size = size; dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, GFP_KERNEL | __GFP_COMP); #ifdef DRM_DEBUG_MEMORY if (dmah->vaddr == NULL) { spin_lock(&drm_mem_lock); ++drm_mem_stats[area].fail_count; spin_unlock(&drm_mem_lock); kfree(dmah); return NULL; } spin_lock(&drm_mem_lock); ++drm_mem_stats[area].succeed_count; drm_mem_stats[area].bytes_allocated += size; drm_ram_used += size; spin_unlock(&drm_mem_lock); #else if (dmah->vaddr == NULL) { kfree(dmah); return NULL; } #endif memset(dmah->vaddr, 0, size); /* XXX - Is virt_to_page() legal for consistent mem? */ /* Reserve */ for (addr = (unsigned long)dmah->vaddr, sz = size; sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { SetPageReserved(virt_to_page(addr)); } return dmah; } EXPORT_SYMBOL(drm_pci_alloc); /** * \brief Free a PCI consistent memory block without freeing its descriptor. * * This function is for internal use in the Linux-specific DRM core code. */ void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah) { unsigned long addr; size_t sz; #ifdef DRM_DEBUG_MEMORY int area = DRM_MEM_DMA; int alloc_count; int free_count; #endif if (!dmah->vaddr) { #ifdef DRM_DEBUG_MEMORY DRM_MEM_ERROR(area, "Attempt to free address 0\n"); #endif } else { /* XXX - Is virt_to_page() legal for consistent mem? */ /* Unreserve */ for (addr = (unsigned long)dmah->vaddr, sz = dmah->size; sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) { ClearPageReserved(virt_to_page(addr)); } dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr, dmah->busaddr); } #ifdef DRM_DEBUG_MEMORY spin_lock(&drm_mem_lock); free_count = ++drm_mem_stats[area].free_count; alloc_count = drm_mem_stats[area].succeed_count; drm_mem_stats[area].bytes_freed += size; drm_ram_used -= size; spin_unlock(&drm_mem_lock); if (free_count > alloc_count) { DRM_MEM_ERROR(area, "Excess frees: %d frees, %d allocs\n", free_count, alloc_count); } #endif } /** * \brief Free a PCI consistent memory block */ void drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah) { __drm_pci_free(dev, dmah); kfree(dmah); } EXPORT_SYMBOL(drm_pci_free); /*@}*/