Merge mga-1-0-0-branch into trunk.

1 files changed, 0 insertions, 370 deletions

diff --git a/linux/vm.c b/linux/vm.c
deleted file mode 100644
index 964921b4..00000000
--- a/linux/vm.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/* vm.c -- Memory mapping for DRM -*- linux-c -*-
- * Created: Mon Jan  4 08:58:31 1999 by faith@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- * 
- * Authors:
- *    Rickard E. (Rik) Faith <faith@valinux.com>
- *
- */
-
-#define __NO_VERSION__
-#include "drmP.h"
-
-struct vm_operations_struct   drm_vm_ops = {
-	nopage:	 drm_vm_nopage,
-	open:	 drm_vm_open,
-	close:	 drm_vm_close,
-};
-
-struct vm_operations_struct   drm_vm_shm_ops = {
-	nopage:	 drm_vm_shm_nopage,
-	open:	 drm_vm_open,
-	close:	 drm_vm_close,
-};
-
-struct vm_operations_struct   drm_vm_shm_lock_ops = {
-	nopage:	 drm_vm_shm_nopage_lock,
-	open:	 drm_vm_open,
-	close:	 drm_vm_close,
-};
-
-struct vm_operations_struct   drm_vm_dma_ops = {
-	nopage:	 drm_vm_dma_nopage,
-	open:	 drm_vm_open,
-	close:	 drm_vm_close,
-};
-
-#if LINUX_VERSION_CODE < 0x020317
-unsigned long drm_vm_nopage(struct vm_area_struct *vma,
-			    unsigned long address,
-			    int write_access)
-#else
-				/* Return type changed in 2.3.23 */
-struct page *drm_vm_nopage(struct vm_area_struct *vma,
-			   unsigned long address,
-			   int write_access)
-#endif
-{
-	return NOPAGE_SIGBUS;		/* Disallow mremap */
-}
-
-#if LINUX_VERSION_CODE < 0x020317
-unsigned long drm_vm_shm_nopage(struct vm_area_struct *vma,
-				unsigned long address,
-				int write_access)
-#else
-				/* Return type changed in 2.3.23 */
-struct page *drm_vm_shm_nopage(struct vm_area_struct *vma,
-			       unsigned long address,
-			       int write_access)
-#endif
-{
-#if LINUX_VERSION_CODE >= 0x020300
-	drm_map_t	 *map	 = (drm_map_t *)vma->vm_private_data;
-#else
-	drm_map_t	 *map	 = (drm_map_t *)vma->vm_pte;
-#endif
-	unsigned long	 physical;
-	unsigned long	 offset;
-
-	if (address > vma->vm_end) return NOPAGE_SIGBUS; /* Disallow mremap */
-	if (!map)    		   return NOPAGE_OOM;  /* Nothing allocated */
-
-	offset	 = address - vma->vm_start;
-	physical = (unsigned long)map->handle + offset;
-	atomic_inc(&virt_to_page(physical)->count); /* Dec. by kernel */
-
-	DRM_DEBUG("0x%08lx => 0x%08lx\n", address, physical);
-#if LINUX_VERSION_CODE < 0x020317
-	return physical;
-#else
-	return virt_to_page(physical);
-#endif
-}
-
-#if LINUX_VERSION_CODE < 0x020317
-unsigned long drm_vm_shm_nopage_lock(struct vm_area_struct *vma,
-				     unsigned long address,
-				     int write_access)
-#else
-				/* Return type changed in 2.3.23 */
-struct page *drm_vm_shm_nopage_lock(struct vm_area_struct *vma,
-				    unsigned long address,
-				    int write_access)
-#endif
-{
-	drm_file_t	 *priv	 = vma->vm_file->private_data;
-	drm_device_t	 *dev	 = priv->dev;
-	unsigned long	 physical;
-	unsigned long	 offset;
-	unsigned long	 page;
-
-	if (address > vma->vm_end) return NOPAGE_SIGBUS; /* Disallow mremap */
-	if (!dev->lock.hw_lock)    return NOPAGE_OOM;  /* Nothing allocated */
-
-	offset	 = address - vma->vm_start;
-	page	 = offset >> PAGE_SHIFT;
-	physical = (unsigned long)dev->lock.hw_lock + offset;
-	atomic_inc(&virt_to_page(physical)->count); /* Dec. by kernel */
-
-	DRM_DEBUG("0x%08lx (page %lu) => 0x%08lx\n", address, page, physical);
-#if LINUX_VERSION_CODE < 0x020317
-	return physical;
-#else
-	return virt_to_page(physical);
-#endif
-}
-
-#if LINUX_VERSION_CODE < 0x020317
-unsigned long drm_vm_dma_nopage(struct vm_area_struct *vma,
-				unsigned long address,
-				int write_access)
-#else
-				/* Return type changed in 2.3.23 */
-struct page *drm_vm_dma_nopage(struct vm_area_struct *vma,
-			       unsigned long address,
-			       int write_access)
-#endif
-{
-	drm_file_t	 *priv	 = vma->vm_file->private_data;
-	drm_device_t	 *dev	 = priv->dev;
-	drm_device_dma_t *dma	 = dev->dma;
-	unsigned long	 physical;
-	unsigned long	 offset;
-	unsigned long	 page;
-
-	if (!dma)		   return NOPAGE_SIGBUS; /* Error */
-	if (address > vma->vm_end) return NOPAGE_SIGBUS; /* Disallow mremap */
-	if (!dma->pagelist)	   return NOPAGE_OOM ; /* Nothing allocated */
-
-	offset	 = address - vma->vm_start; /* vm_[pg]off[set] should be 0 */
-	page	 = offset >> PAGE_SHIFT;
-	physical = dma->pagelist[page] + (offset & (~PAGE_MASK));
-	atomic_inc(&virt_to_page(physical)->count); /* Dec. by kernel */
-
-	DRM_DEBUG("0x%08lx (page %lu) => 0x%08lx\n", address, page, physical);
-#if LINUX_VERSION_CODE < 0x020317
-	return physical;
-#else
-	return virt_to_page(physical);
-#endif
-}
-
-void drm_vm_open(struct vm_area_struct *vma)
-{
-	drm_file_t	*priv	= vma->vm_file->private_data;
-	drm_device_t	*dev	= priv->dev;
-#if DRM_DEBUG_CODE
-	drm_vma_entry_t *vma_entry;
-#endif
-
-	DRM_DEBUG("0x%08lx,0x%08lx\n",
-		  vma->vm_start, vma->vm_end - vma->vm_start);
-	atomic_inc(&dev->vma_count);
-#if LINUX_VERSION_CODE < 0x020333
-				/* The map can exist after the fd is closed. */
-	MOD_INC_USE_COUNT; /* Needed before Linux 2.3.51 */
-#endif
-
-
-#if DRM_DEBUG_CODE
-	vma_entry = drm_alloc(sizeof(*vma_entry), DRM_MEM_VMAS);
-	if (vma_entry) {
-		down(&dev->struct_sem);
-		vma_entry->vma	= vma;
-		vma_entry->next = dev->vmalist;
-		vma_entry->pid	= current->pid;
-		dev->vmalist	= vma_entry;
-		up(&dev->struct_sem);
-	}
-#endif
-}
-
-void drm_vm_close(struct vm_area_struct *vma)
-{
-	drm_file_t	*priv	= vma->vm_file->private_data;
-	drm_device_t	*dev	= priv->dev;
-#if DRM_DEBUG_CODE
-	drm_vma_entry_t *pt, *prev;
-#endif
-
-	DRM_DEBUG("0x%08lx,0x%08lx\n",
-		  vma->vm_start, vma->vm_end - vma->vm_start);
-#if LINUX_VERSION_CODE < 0x020333
-	MOD_DEC_USE_COUNT; /* Needed before Linux 2.3.51 */
-#endif
-	atomic_dec(&dev->vma_count);
-
-#if DRM_DEBUG_CODE
-	down(&dev->struct_sem);
-	for (pt = dev->vmalist, prev = NULL; pt; prev = pt, pt = pt->next) {
-		if (pt->vma == vma) {
-			if (prev) {
-				prev->next = pt->next;
-			} else {
-				dev->vmalist = pt->next;
-			}
-			drm_free(pt, sizeof(*pt), DRM_MEM_VMAS);
-			break;
-		}
-	}
-	up(&dev->struct_sem);
-#endif
-}
-
-int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
-{
-	drm_file_t	 *priv	 = filp->private_data;
-	drm_device_t	 *dev;
-	drm_device_dma_t *dma;
-	unsigned long	 length	 = vma->vm_end - vma->vm_start;
-	
-	lock_kernel();
-	dev	 = priv->dev;
-	dma	 = dev->dma;
-	DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
-		  vma->vm_start, vma->vm_end, VM_OFFSET(vma));
-
-				/* Length must match exact page count */
-	if (!dma || (length >> PAGE_SHIFT) != dma->page_count) {
-		unlock_kernel();
-		return -EINVAL;
-	}
-	unlock_kernel();
-
-	vma->vm_ops   = &drm_vm_dma_ops;
-	vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
-	
-#if LINUX_VERSION_CODE < 0x020203 /* KERNEL_VERSION(2,2,3) */
-				/* In Linux 2.2.3 and above, this is
-				   handled in do_mmap() in mm/mmap.c. */
-	++filp->f_count;
-#endif
-	vma->vm_file  =	 filp;	/* Needed for drm_vm_open() */
-	drm_vm_open(vma);
-	return 0;
-}
-
-int drm_mmap(struct file *filp, struct vm_area_struct *vma)
-{
-	drm_file_t	*priv	= filp->private_data;
-	drm_device_t	*dev	= priv->dev;
-	drm_map_t	*map	= NULL;
-	int		i;
-	
-	DRM_DEBUG("start = 0x%lx, end = 0x%lx, offset = 0x%lx\n",
-		  vma->vm_start, vma->vm_end, VM_OFFSET(vma));
-
-	if (!VM_OFFSET(vma)) return drm_mmap_dma(filp, vma);
-
-				/* A sequential search of a linked list is
-				   fine here because: 1) there will only be
-				   about 5-10 entries in the list and, 2) a
-				   DRI client only has to do this mapping
-				   once, so it doesn't have to be optimized
-				   for performance, even if the list was a
-				   bit longer. */
-	for (i = 0; i < dev->map_count; i++) {
-		map = dev->maplist[i];
-		if (map->offset == VM_OFFSET(vma)) break;
-	}
-	
-	if (i >= dev->map_count) return -EINVAL;
-	if (!map || ((map->flags&_DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN)))
-		return -EPERM;
-
-				/* Check for valid size. */
-	if (map->size != vma->vm_end - vma->vm_start) return -EINVAL;
-	
-	if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) {
-		vma->vm_flags &= VM_MAYWRITE;
-#if defined(__i386__)
-		pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW;
-#else
-				/* Ye gads this is ugly.  With more thought
-                                   we could move this up higher and use
-                                   `protection_map' instead.  */
-		vma->vm_page_prot = __pgprot(pte_val(pte_wrprotect(
-			__pte(pgprot_val(vma->vm_page_prot)))));
-#endif
-	}
-
-	switch (map->type) {
-	case _DRM_FRAME_BUFFER:
-	case _DRM_REGISTERS:
-	case _DRM_AGP:
-		if (VM_OFFSET(vma) >= __pa(high_memory)) {
-#if defined(__i386__)
-			if (boot_cpu_data.x86 > 3 && map->type != _DRM_AGP) {
-				pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
-				pgprot_val(vma->vm_page_prot) &= ~_PAGE_PWT;
-			}
-#elif defined(__ia64__)
-			if (map->type != _DRM_AGP)
-				vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-#endif
-			vma->vm_flags |= VM_IO;	/* not in core dump */
-		}
-		if (remap_page_range(vma->vm_start,
-				     VM_OFFSET(vma),
-				     vma->vm_end - vma->vm_start,
-				     vma->vm_page_prot))
-				return -EAGAIN;
-		DRM_DEBUG("   Type = %d; start = 0x%lx, end = 0x%lx,"
-			  " offset = 0x%lx\n",
-			  map->type,
-			  vma->vm_start, vma->vm_end, VM_OFFSET(vma));
-		vma->vm_ops = &drm_vm_ops;
-		break;
-	case _DRM_SHM:
-		if (map->flags & _DRM_CONTAINS_LOCK)
-			vma->vm_ops = &drm_vm_shm_lock_ops;
-		else {
-			vma->vm_ops = &drm_vm_shm_ops;
-#if LINUX_VERSION_CODE >= 0x020300
-			vma->vm_private_data = (void *)map;
-#else
-			vma->vm_pte = (unsigned long)map;
-#endif
-		}
-
-				/* Don't let this area swap.  Change when
-				   DRM_KERNEL advisory is supported. */
-		vma->vm_flags |= VM_LOCKED;
-		break;
-	default:
-		return -EINVAL;	/* This should never happen. */
-	}
-	vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */
-
-#if LINUX_VERSION_CODE < 0x020203 /* KERNEL_VERSION(2,2,3) */
-				/* In Linux 2.2.3 and above, this is
-				   handled in do_mmap() in mm/mmap.c. */
-	++filp->f_count;
-#endif
-	vma->vm_file  =	 filp;	/* Needed for drm_vm_open() */
-	drm_vm_open(vma);
-	return 0;
-}