drm: add drm simple memory manager support for SiS and VIA drivers
authorThomas Hellstrom <thomas@tungstengraphics.com>
Mon, 7 Aug 2006 12:03:22 +0000 (22:03 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 21 Sep 2006 19:32:31 +0000 (05:32 +1000)
This add support to the SiS and VIA drivers for the simple memory manager.
This fixes a lot of problems with the current simple code these drivers used,
including locking and SMP issues.

Signed-off-by: Dave Airlie <airlied@linux.ie>
12 files changed:
drivers/char/drm/Makefile
drivers/char/drm/sis_drv.c
drivers/char/drm/sis_drv.h
drivers/char/drm/sis_ds.c [deleted file]
drivers/char/drm/sis_ds.h [deleted file]
drivers/char/drm/sis_mm.c
drivers/char/drm/via_drv.c
drivers/char/drm/via_drv.h
drivers/char/drm/via_ds.c [deleted file]
drivers/char/drm/via_ds.h [deleted file]
drivers/char/drm/via_map.c
drivers/char/drm/via_mm.c

index 5eb79f2d5587c96166856888ccfc4b1d4fe32835..3ad0f648c6b22340e79f0f12068f5661808a3c43 100644 (file)
@@ -16,9 +16,9 @@ i830-objs   := i830_drv.o i830_dma.o i830_irq.o
 i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
 radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
 ffb-objs    := ffb_drv.o ffb_context.o
-sis-objs    := sis_drv.o sis_ds.o sis_mm.o
+sis-objs    := sis_drv.o sis_mm.o
 savage-objs := savage_drv.o savage_bci.o savage_state.o
-via-objs    := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
+via-objs    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
 
 ifeq ($(CONFIG_COMPAT),y)
 drm-objs    += drm_ioc32.o
index 5e9dc86f2956f5ed93683ca618f375b9917e03b2..93880e4492014079b19c8cb1c809fa7df0c286f9 100644 (file)
@@ -35,11 +35,43 @@ static struct pci_device_id pciidlist[] = {
        sisdrv_PCI_IDS
 };
 
+static int sis_driver_load(drm_device_t *dev, unsigned long chipset)
+{
+       drm_sis_private_t *dev_priv;
+       int ret;
+
+       dev_priv = drm_calloc(1, sizeof(drm_sis_private_t), DRM_MEM_DRIVER);
+       if (dev_priv == NULL)
+               return DRM_ERR(ENOMEM);
+
+       dev->dev_private = (void *)dev_priv;
+       dev_priv->chipset = chipset;
+       ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
+       if (ret) {
+               drm_free(dev_priv, sizeof(dev_priv), DRM_MEM_DRIVER);
+       }
+
+       return ret;
+}
+
+static int sis_driver_unload(drm_device_t *dev)
+{
+       drm_sis_private_t *dev_priv = dev->dev_private;
+
+       drm_sman_takedown(&dev_priv->sman);
+       drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+
+       return 0;
+}
+
 static struct drm_driver driver = {
        .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,
-       .context_ctor = sis_init_context,
-       .context_dtor = sis_final_context,
-       .reclaim_buffers = drm_core_reclaim_buffers,
+       .load = sis_driver_load,
+       .unload = sis_driver_unload,
+       .context_dtor = NULL,
+       .reclaim_buffers = NULL,
+       .reclaim_buffers_locked = sis_reclaim_buffers_locked,
+       .lastclose = sis_lastclose,
        .get_map_ofs = drm_core_get_map_ofs,
        .get_reg_ofs = drm_core_get_reg_ofs,
        .ioctls = sis_ioctls,
index e218e5269503b80ff65d6127b249ba88baf79bab..330a2c4eade2dec8bd35620c9423ef849a09a21d 100644 (file)
 /* General customization:
  */
 
-#define DRIVER_AUTHOR          "SIS"
+#define DRIVER_AUTHOR          "SIS, Tungsten Graphics"
 #define DRIVER_NAME            "sis"
 #define DRIVER_DESC            "SIS 300/630/540"
-#define DRIVER_DATE            "20030826"
+#define DRIVER_DATE            "20060529"
 #define DRIVER_MAJOR           1
-#define DRIVER_MINOR           1
-#define DRIVER_PATCHLEVEL      0
+#define DRIVER_MINOR           2
+#define DRIVER_PATCHLEVEL      1
 
-#include "sis_ds.h"
+#include "drm_sman.h"
 
 typedef struct drm_sis_private {
-       memHeap_t *AGPHeap;
-       memHeap_t *FBHeap;
+       drm_local_map_t *mmio;
+       unsigned int idle_fault;
+       drm_sman_t sman;
+       unsigned int chipset;
+       int vram_initialized;
+       int agp_initialized;
+       unsigned long vram_offset;
+       unsigned long agp_offset;
 } drm_sis_private_t;
 
-extern int sis_init_context(drm_device_t * dev, int context);
-extern int sis_final_context(drm_device_t * dev, int context);
+extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp);
+extern void sis_lastclose(drm_device_t *dev);
 
 extern drm_ioctl_desc_t sis_ioctls[];
 extern int sis_max_ioctl;
diff --git a/drivers/char/drm/sis_ds.c b/drivers/char/drm/sis_ds.c
deleted file mode 100644 (file)
index 2e485d4..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-/* sis_ds.c -- Private header for Direct Rendering Manager -*- linux-c -*-
- * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
- *
- * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
- * 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:
- *    Sung-Ching Lin <sclin@sis.com.tw>
- *
- */
-
-#include "drmP.h"
-#include "drm.h"
-#include "sis_ds.h"
-
-/* Set Data Structure, not check repeated value
- * temporarily used
- */
-
-set_t *setInit(void)
-{
-       int i;
-       set_t *set;
-
-       set = (set_t *) drm_alloc(sizeof(set_t), DRM_MEM_DRIVER);
-       if (set != NULL) {
-               for (i = 0; i < SET_SIZE; i++) {
-                       set->list[i].free_next = i + 1;
-                       set->list[i].alloc_next = -1;
-               }
-               set->list[SET_SIZE - 1].free_next = -1;
-               set->free = 0;
-               set->alloc = -1;
-               set->trace = -1;
-       }
-       return set;
-}
-
-int setAdd(set_t * set, ITEM_TYPE item)
-{
-       int free = set->free;
-
-       if (free != -1) {
-               set->list[free].val = item;
-               set->free = set->list[free].free_next;
-       } else {
-               return 0;
-       }
-
-       set->list[free].alloc_next = set->alloc;
-       set->alloc = free;
-       set->list[free].free_next = -1;
-
-       return 1;
-}
-
-int setDel(set_t * set, ITEM_TYPE item)
-{
-       int alloc = set->alloc;
-       int prev = -1;
-
-       while (alloc != -1) {
-               if (set->list[alloc].val == item) {
-                       if (prev != -1)
-                               set->list[prev].alloc_next =
-                                   set->list[alloc].alloc_next;
-                       else
-                               set->alloc = set->list[alloc].alloc_next;
-                       break;
-               }
-               prev = alloc;
-               alloc = set->list[alloc].alloc_next;
-       }
-
-       if (alloc == -1)
-               return 0;
-
-       set->list[alloc].free_next = set->free;
-       set->free = alloc;
-       set->list[alloc].alloc_next = -1;
-
-       return 1;
-}
-
-/* setFirst -> setAdd -> setNext is wrong */
-
-int setFirst(set_t * set, ITEM_TYPE * item)
-{
-       if (set->alloc == -1)
-               return 0;
-
-       *item = set->list[set->alloc].val;
-       set->trace = set->list[set->alloc].alloc_next;
-
-       return 1;
-}
-
-int setNext(set_t * set, ITEM_TYPE * item)
-{
-       if (set->trace == -1)
-               return 0;
-
-       *item = set->list[set->trace].val;
-       set->trace = set->list[set->trace].alloc_next;
-
-       return 1;
-}
-
-int setDestroy(set_t * set)
-{
-       drm_free(set, sizeof(set_t), DRM_MEM_DRIVER);
-
-       return 1;
-}
-
-/*
- * GLX Hardware Device Driver common code
- * Copyright (C) 1999 Wittawat Yamwong
- *
- * 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 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
- * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS 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.
- *
- */
-
-#define ISFREE(bptr) ((bptr)->free)
-
-memHeap_t *mmInit(int ofs, int size)
-{
-       PMemBlock blocks;
-
-       if (size <= 0)
-               return NULL;
-
-       blocks = (TMemBlock *) drm_calloc(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
-       if (blocks != NULL) {
-               blocks->ofs = ofs;
-               blocks->size = size;
-               blocks->free = 1;
-               return (memHeap_t *) blocks;
-       } else
-               return NULL;
-}
-
-/* Checks if a pointer 'b' is part of the heap 'heap' */
-int mmBlockInHeap(memHeap_t * heap, PMemBlock b)
-{
-       TMemBlock *p;
-
-       if (heap == NULL || b == NULL)
-               return 0;
-
-       p = heap;
-       while (p != NULL && p != b) {
-               p = p->next;
-       }
-       if (p == b)
-               return 1;
-       else
-               return 0;
-}
-
-static TMemBlock *SliceBlock(TMemBlock * p,
-                            int startofs, int size,
-                            int reserved, int alignment)
-{
-       TMemBlock *newblock;
-
-       /* break left */
-       if (startofs > p->ofs) {
-               newblock = (TMemBlock *) drm_calloc(1, sizeof(TMemBlock),
-                                                   DRM_MEM_DRIVER);
-               newblock->ofs = startofs;
-               newblock->size = p->size - (startofs - p->ofs);
-               newblock->free = 1;
-               newblock->next = p->next;
-               p->size -= newblock->size;
-               p->next = newblock;
-               p = newblock;
-       }
-
-       /* break right */
-       if (size < p->size) {
-               newblock = (TMemBlock *) drm_calloc(1, sizeof(TMemBlock),
-                                                   DRM_MEM_DRIVER);
-               newblock->ofs = startofs + size;
-               newblock->size = p->size - size;
-               newblock->free = 1;
-               newblock->next = p->next;
-               p->size = size;
-               p->next = newblock;
-       }
-
-       /* p = middle block */
-       p->align = alignment;
-       p->free = 0;
-       p->reserved = reserved;
-       return p;
-}
-
-PMemBlock mmAllocMem(memHeap_t * heap, int size, int align2, int startSearch)
-{
-       int mask, startofs, endofs;
-       TMemBlock *p;
-
-       if (heap == NULL || align2 < 0 || size <= 0)
-               return NULL;
-
-       mask = (1 << align2) - 1;
-       startofs = 0;
-       p = (TMemBlock *) heap;
-       while (p != NULL) {
-               if (ISFREE(p)) {
-                       startofs = (p->ofs + mask) & ~mask;
-                       if (startofs < startSearch) {
-                               startofs = startSearch;
-                       }
-                       endofs = startofs + size;
-                       if (endofs <= (p->ofs + p->size))
-                               break;
-               }
-               p = p->next;
-       }
-       if (p == NULL)
-               return NULL;
-       p = SliceBlock(p, startofs, size, 0, mask + 1);
-       p->heap = heap;
-       return p;
-}
-
-static __inline__ int Join2Blocks(TMemBlock * p)
-{
-       if (p->free && p->next && p->next->free) {
-               TMemBlock *q = p->next;
-               p->size += q->size;
-               p->next = q->next;
-               drm_free(q, sizeof(TMemBlock), DRM_MEM_DRIVER);
-               return 1;
-       }
-       return 0;
-}
-
-int mmFreeMem(PMemBlock b)
-{
-       TMemBlock *p, *prev;
-
-       if (b == NULL)
-               return 0;
-       if (b->heap == NULL)
-               return -1;
-
-       p = b->heap;
-       prev = NULL;
-       while (p != NULL && p != b) {
-               prev = p;
-               p = p->next;
-       }
-       if (p == NULL || p->free || p->reserved)
-               return -1;
-
-       p->free = 1;
-       Join2Blocks(p);
-       if (prev)
-               Join2Blocks(prev);
-       return 0;
-}
diff --git a/drivers/char/drm/sis_ds.h b/drivers/char/drm/sis_ds.h
deleted file mode 100644 (file)
index 94f2b47..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-/* sis_ds.h -- Private header for Direct Rendering Manager -*- linux-c -*- 
- * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
- */
-/*
- * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
- * 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:
- *    Sung-Ching Lin <sclin@sis.com.tw>
- *
- */
-
-#ifndef __SIS_DS_H__
-#define __SIS_DS_H__
-
-/* Set Data Structure */
-
-#define SET_SIZE 5000
-
-typedef unsigned long ITEM_TYPE;
-
-typedef struct {
-       ITEM_TYPE val;
-       int alloc_next, free_next;
-} list_item_t;
-
-typedef struct {
-       int alloc;
-       int free;
-       int trace;
-       list_item_t list[SET_SIZE];
-} set_t;
-
-set_t *setInit(void);
-int setAdd(set_t * set, ITEM_TYPE item);
-int setDel(set_t * set, ITEM_TYPE item);
-int setFirst(set_t * set, ITEM_TYPE * item);
-int setNext(set_t * set, ITEM_TYPE * item);
-int setDestroy(set_t * set);
-
-/*
- * GLX Hardware Device Driver common code
- * Copyright (C) 1999 Wittawat Yamwong
- *
- * 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 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
- * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS 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.
- *
- */
-
-struct mem_block_t {
-       struct mem_block_t *next;
-       struct mem_block_t *heap;
-       int ofs, size;
-       int align;
-       unsigned int free:1;
-       unsigned int reserved:1;
-};
-typedef struct mem_block_t TMemBlock;
-typedef struct mem_block_t *PMemBlock;
-
-/* a heap is just the first block in a chain */
-typedef struct mem_block_t memHeap_t;
-
-static __inline__ int mmBlockSize(PMemBlock b)
-{
-       return b->size;
-}
-
-static __inline__ int mmOffset(PMemBlock b)
-{
-       return b->ofs;
-}
-
-static __inline__ void mmMarkReserved(PMemBlock b)
-{
-       b->reserved = 1;
-}
-
-/*
- * input: total size in bytes
- * return: a heap pointer if OK, NULL if error
- */
-memHeap_t *mmInit(int ofs, int size);
-
-/*
- * Allocate 'size' bytes with 2^align2 bytes alignment,
- * restrict the search to free memory after 'startSearch'
- * depth and back buffers should be in different 4mb banks
- * to get better page hits if possible
- * input:      size = size of block
- *             align2 = 2^align2 bytes alignment
- *             startSearch = linear offset from start of heap to begin search
- * return: pointer to the allocated block, 0 if error
- */
-PMemBlock mmAllocMem(memHeap_t * heap, int size, int align2, int startSearch);
-
-/*
- * Returns 1 if the block 'b' is part of the heap 'heap'
- */
-int mmBlockInHeap(PMemBlock heap, PMemBlock b);
-
-/*
- * Free block starts at offset
- * input: pointer to a block
- * return: 0 if OK, -1 if error
- */
-int mmFreeMem(PMemBlock b);
-
-/* For debuging purpose. */
-void mmDumpMemInfo(memHeap_t * mmInit);
-
-#endif                         /* __SIS_DS_H__ */
index 5e9936bc307fc21d7a321fae5e1ce2377182aee6..0eb1dca232b72565b66318fc02b4a0c3643d952f 100644 (file)
-/* sis_mm.c -- Private header for Direct Rendering Manager -*- linux-c -*-
- * Created: Mon Jan  4 10:05:05 1999 by sclin@sis.com.tw
+/**************************************************************************
  *
- * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
- * All rights reserved.
+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA.
+ * 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:
+ * 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, sub license, 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 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.
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS 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:
- *    Sung-Ching Lin <sclin@sis.com.tw>
  *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *    Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
 #include "drmP.h"
 #include "sis_drm.h"
 #include "sis_drv.h"
-#include "sis_ds.h"
-#if defined(__linux__) && defined(CONFIG_FB_SIS)
+
 #include <video/sisfb.h>
-#endif
 
-#define MAX_CONTEXT 100
 #define VIDEO_TYPE 0
 #define AGP_TYPE 1
 
-typedef struct {
-       int used;
-       int context;
-       set_t *sets[2];         /* 0 for video, 1 for AGP */
-} sis_context_t;
-
-static sis_context_t global_ppriv[MAX_CONTEXT];
+#define SIS_MM_ALIGN_SHIFT 4
+#define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1)
 
-static int add_alloc_set(int context, int type, unsigned int val)
-{
-       int i, retval = 0;
+#if defined(CONFIG_FB_SIS)
+/* fb management via fb device */
 
-       for (i = 0; i < MAX_CONTEXT; i++) {
-               if (global_ppriv[i].used && global_ppriv[i].context == context) {
-                       retval = setAdd(global_ppriv[i].sets[type], val);
-                       break;
-               }
-       }
-       return retval;
-}
+#define SIS_MM_ALIGN_SHIFT 0
+#define SIS_MM_ALIGN_MASK 0
 
-static int del_alloc_set(int context, int type, unsigned int val)
+static void *sis_sman_mm_allocate(void *private, unsigned long size,
+                                 unsigned alignment)
 {
-       int i, retval = 0;
+       struct sis_memreq req;
 
-       for (i = 0; i < MAX_CONTEXT; i++) {
-               if (global_ppriv[i].used && global_ppriv[i].context == context) {
-                       retval = setDel(global_ppriv[i].sets[type], val);
-                       break;
-               }
-       }
-       return retval;
+       req.size = size;
+       sis_malloc(&req);
+       if (req.size == 0)
+               return NULL;
+       else
+               return (void *)~req.offset;
 }
 
-/* fb management via fb device */
-#if defined(__linux__) && defined(CONFIG_FB_SIS)
-
-static int sis_fb_init(DRM_IOCTL_ARGS)
+static void sis_sman_mm_free(void *private, void *ref)
 {
-       return 0;
+       sis_free(~((unsigned long)ref));
 }
 
-static int sis_fb_alloc(DRM_IOCTL_ARGS)
+static void sis_sman_mm_destroy(void *private)
 {
-       drm_sis_mem_t fb;
-       struct sis_memreq req;
-       drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
-       int retval = 0;
-
-       DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
-
-       req.size = fb.size;
-       sis_malloc(&req);
-       if (req.offset) {
-               /* TODO */
-               fb.offset = req.offset;
-               fb.free = req.offset;
-               if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
-                       DRM_DEBUG("adding to allocation set fails\n");
-                       sis_free(req.offset);
-                       retval = DRM_ERR(EINVAL);
-               }
-       } else {
-               fb.offset = 0;
-               fb.size = 0;
-               fb.free = 0;
-       }
-
-       DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb));
-
-       DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, req.offset);
-
-       return retval;
+       ;
 }
 
-static int sis_fb_free(DRM_IOCTL_ARGS)
+unsigned long sis_sman_mm_offset(void *private, void *ref)
 {
-       drm_sis_mem_t fb;
-       int retval = 0;
-
-       DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *) data, sizeof(fb));
-
-       if (!fb.free)
-               return DRM_ERR(EINVAL);
-
-       if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
-               retval = DRM_ERR(EINVAL);
-       sis_free(fb.free);
-
-       DRM_DEBUG("free fb, offset = 0x%lx\n", fb.free);
-
-       return retval;
+       return ~((unsigned long)ref);
 }
 
-#else
+#endif
 
-/* Called by the X Server to initialize the FB heap.  Allocations will fail
- * unless this is called.  Offset is the beginning of the heap from the
- * framebuffer offset (MaxXFBMem in XFree86).
- *
- * Memory layout according to Thomas Winischofer:
- * |------------------|DDDDDDDDDDDDDDDDDDDDDDDDDDDDD|HHHH|CCCCCCCCCCC|
- *
- *    X driver/sisfb                                  HW-   Command-
- *  framebuffer memory           DRI heap           Cursor   queue
- */
 static int sis_fb_init(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_sis_private_t *dev_priv = dev->dev_private;
        drm_sis_fb_t fb;
+       int ret;
 
        DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t __user *) data, sizeof(fb));
 
-       if (dev_priv == NULL) {
-               dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
-                                             DRM_MEM_DRIVER);
-               dev_priv = dev->dev_private;
-               if (dev_priv == NULL)
-                       return ENOMEM;
+       mutex_lock(&dev->struct_mutex);
+#if defined(CONFIG_FB_SIS)
+       {
+               drm_sman_mm_t sman_mm;
+               sman_mm.private = (void *)0xFFFFFFFF;
+               sman_mm.allocate = sis_sman_mm_allocate;
+               sman_mm.free = sis_sman_mm_free;
+               sman_mm.destroy = sis_sman_mm_destroy;
+               sman_mm.offset = sis_sman_mm_offset;
+               ret =
+                   drm_sman_set_manager(&dev_priv->sman, VIDEO_TYPE, &sman_mm);
        }
+#else
+       ret = drm_sman_set_range(&dev_priv->sman, VIDEO_TYPE, 0,
+                                fb.size >> SIS_MM_ALIGN_SHIFT);
+#endif
 
-       if (dev_priv->FBHeap != NULL)
-               return DRM_ERR(EINVAL);
+       if (ret) {
+               DRM_ERROR("VRAM memory manager initialisation error\n");
+               mutex_unlock(&dev->struct_mutex);
+               return ret;
+       }
 
-       dev_priv->FBHeap = mmInit(fb.offset, fb.size);
+       dev_priv->vram_initialized = TRUE;
+       dev_priv->vram_offset = fb.offset;
 
+       mutex_unlock(&dev->struct_mutex);
        DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size);
 
        return 0;
 }
 
-static int sis_fb_alloc(DRM_IOCTL_ARGS)
+static int sis_drm_alloc(drm_device_t * dev, drm_file_t * priv,
+                        unsigned long data, int pool)
 {
-       DRM_DEVICE;
        drm_sis_private_t *dev_priv = dev->dev_private;
-       drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
-       drm_sis_mem_t fb;
-       PMemBlock block;
+       drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *) data;
+       drm_sis_mem_t mem;
        int retval = 0;
+       drm_memblock_item_t *item;
 
-       if (dev_priv == NULL || dev_priv->FBHeap == NULL)
+       DRM_COPY_FROM_USER_IOCTL(mem, argp, sizeof(mem));
+
+       mutex_lock(&dev->struct_mutex);
+
+       if (FALSE == ((pool == 0) ? dev_priv->vram_initialized :
+                     dev_priv->agp_initialized)) {
+               DRM_ERROR
+                   ("Attempt to allocate from uninitialized memory manager.\n");
                return DRM_ERR(EINVAL);
+       }
 
-       DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
-
-       block = mmAllocMem(dev_priv->FBHeap, fb.size, 0, 0);
-       if (block) {
-               /* TODO */
-               fb.offset = block->ofs;
-               fb.free = (unsigned long)block;
-               if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
-                       DRM_DEBUG("adding to allocation set fails\n");
-                       mmFreeMem((PMemBlock) fb.free);
-                       retval = DRM_ERR(EINVAL);
-               }
+       mem.size = (mem.size + SIS_MM_ALIGN_MASK) >> SIS_MM_ALIGN_SHIFT;
+       item = drm_sman_alloc(&dev_priv->sman, pool, mem.size, 0,
+                             (unsigned long)priv);
+
+       mutex_unlock(&dev->struct_mutex);
+       if (item) {
+               mem.offset = ((pool == 0) ?
+                             dev_priv->vram_offset : dev_priv->agp_offset) +
+                   (item->mm->
+                    offset(item->mm, item->mm_info) << SIS_MM_ALIGN_SHIFT);
+               mem.free = item->user_hash.key;
+               mem.size = mem.size << SIS_MM_ALIGN_SHIFT;
        } else {
-               fb.offset = 0;
-               fb.size = 0;
-               fb.free = 0;
+               mem.offset = 0;
+               mem.size = 0;
+               mem.free = 0;
+               retval = DRM_ERR(ENOMEM);
        }
 
-       DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb));
+       DRM_COPY_TO_USER_IOCTL(argp, mem, sizeof(mem));
 
-       DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, fb.offset);
+       DRM_DEBUG("alloc %d, size = %d, offset = %d\n", pool, mem.size,
+                 mem.offset);
 
        return retval;
 }
 
-static int sis_fb_free(DRM_IOCTL_ARGS)
+static int sis_drm_free(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_sis_private_t *dev_priv = dev->dev_private;
-       drm_sis_mem_t fb;
+       drm_sis_mem_t mem;
+       int ret;
 
-       if (dev_priv == NULL || dev_priv->FBHeap == NULL)
-               return DRM_ERR(EINVAL);
-
-       DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *) data, sizeof(fb));
+       DRM_COPY_FROM_USER_IOCTL(mem, (drm_sis_mem_t __user *) data,
+                                sizeof(mem));
 
-       if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock) fb.free))
-               return DRM_ERR(EINVAL);
+       mutex_lock(&dev->struct_mutex);
+       ret = drm_sman_free_key(&dev_priv->sman, mem.free);
+       mutex_unlock(&dev->struct_mutex);
+       DRM_DEBUG("free = 0x%lx\n", mem.free);
 
-       if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
-               return DRM_ERR(EINVAL);
-       mmFreeMem((PMemBlock) fb.free);
-
-       DRM_DEBUG("free fb, free = 0x%lx\n", fb.free);
-
-       return 0;
+       return ret;
 }
 
-#endif
-
-/* agp memory management */
+static int sis_fb_alloc(DRM_IOCTL_ARGS)
+{
+       DRM_DEVICE;
+       return sis_drm_alloc(dev, priv, data, VIDEO_TYPE);
+}
 
 static int sis_ioctl_agp_init(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_sis_private_t *dev_priv = dev->dev_private;
        drm_sis_agp_t agp;
-
-       if (dev_priv == NULL) {
-               dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
-                                             DRM_MEM_DRIVER);
-               dev_priv = dev->dev_private;
-               if (dev_priv == NULL)
-                       return ENOMEM;
-       }
-
-       if (dev_priv->AGPHeap != NULL)
-               return DRM_ERR(EINVAL);
+       int ret;
+       dev_priv = dev->dev_private;
 
        DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t __user *) data,
                                 sizeof(agp));
+       mutex_lock(&dev->struct_mutex);
+       ret = drm_sman_set_range(&dev_priv->sman, AGP_TYPE, 0,
+                                agp.size >> SIS_MM_ALIGN_SHIFT);
+
+       if (ret) {
+               DRM_ERROR("AGP memory manager initialisation error\n");
+               mutex_unlock(&dev->struct_mutex);
+               return ret;
+       }
 
-       dev_priv->AGPHeap = mmInit(agp.offset, agp.size);
+       dev_priv->agp_initialized = TRUE;
+       dev_priv->agp_offset = agp.offset;
+       mutex_unlock(&dev->struct_mutex);
 
        DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size);
-
        return 0;
 }
 
 static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
-       drm_sis_private_t *dev_priv = dev->dev_private;
-       drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
-       drm_sis_mem_t agp;
-       PMemBlock block;
-       int retval = 0;
-
-       if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
-               return DRM_ERR(EINVAL);
-
-       DRM_COPY_FROM_USER_IOCTL(agp, argp, sizeof(agp));
-
-       block = mmAllocMem(dev_priv->AGPHeap, agp.size, 0, 0);
-       if (block) {
-               /* TODO */
-               agp.offset = block->ofs;
-               agp.free = (unsigned long)block;
-               if (!add_alloc_set(agp.context, AGP_TYPE, agp.free)) {
-                       DRM_DEBUG("adding to allocation set fails\n");
-                       mmFreeMem((PMemBlock) agp.free);
-                       retval = -1;
-               }
-       } else {
-               agp.offset = 0;
-               agp.size = 0;
-               agp.free = 0;
-       }
 
-       DRM_COPY_TO_USER_IOCTL(argp, agp, sizeof(agp));
-
-       DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset);
-
-       return retval;
+       return sis_drm_alloc(dev, priv, data, AGP_TYPE);
 }
 
-static int sis_ioctl_agp_free(DRM_IOCTL_ARGS)
+void sis_lastclose(struct drm_device *dev)
 {
-       DRM_DEVICE;
        drm_sis_private_t *dev_priv = dev->dev_private;
-       drm_sis_mem_t agp;
-
-       if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
-               return DRM_ERR(EINVAL);
-
-       DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t __user *) data,
-                                sizeof(agp));
-
-       if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock) agp.free))
-               return DRM_ERR(EINVAL);
-
-       mmFreeMem((PMemBlock) agp.free);
-       if (!del_alloc_set(agp.context, AGP_TYPE, agp.free))
-               return DRM_ERR(EINVAL);
-
-       DRM_DEBUG("free agp, free = 0x%lx\n", agp.free);
 
-       return 0;
-}
-
-int sis_init_context(struct drm_device *dev, int context)
-{
-       int i;
+       if (!dev_priv)
+               return;
 
-       for (i = 0; i < MAX_CONTEXT; i++) {
-               if (global_ppriv[i].used &&
-                   (global_ppriv[i].context == context))
-                       break;
-       }
-
-       if (i >= MAX_CONTEXT) {
-               for (i = 0; i < MAX_CONTEXT; i++) {
-                       if (!global_ppriv[i].used) {
-                               global_ppriv[i].context = context;
-                               global_ppriv[i].used = 1;
-                               global_ppriv[i].sets[0] = setInit();
-                               global_ppriv[i].sets[1] = setInit();
-                               DRM_DEBUG("init allocation set, socket=%d, "
-                                         "context = %d\n", i, context);
-                               break;
-                       }
-               }
-               if ((i >= MAX_CONTEXT) || (global_ppriv[i].sets[0] == NULL) ||
-                   (global_ppriv[i].sets[1] == NULL)) {
-                       return 0;
-               }
-       }
-
-       return 1;
+       mutex_lock(&dev->struct_mutex);
+       drm_sman_cleanup(&dev_priv->sman);
+       dev_priv->vram_initialized = FALSE;
+       dev_priv->agp_initialized = FALSE;
+       mutex_unlock(&dev->struct_mutex);
 }
 
-int sis_final_context(struct drm_device *dev, int context)
+void sis_reclaim_buffers_locked(drm_device_t * dev, struct file *filp)
 {
-       int i;
+       drm_sis_private_t *dev_priv = dev->dev_private;
+       drm_file_t *priv = filp->private_data;
 
-       for (i = 0; i < MAX_CONTEXT; i++) {
-               if (global_ppriv[i].used &&
-                   (global_ppriv[i].context == context))
-                       break;
+       mutex_lock(&dev->struct_mutex);
+       if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {
+               mutex_unlock(&dev->struct_mutex);
+               return;
        }
 
-       if (i < MAX_CONTEXT) {
-               set_t *set;
-               ITEM_TYPE item;
-               int retval;
-
-               DRM_DEBUG("find socket %d, context = %d\n", i, context);
-
-               /* Video Memory */
-               set = global_ppriv[i].sets[0];
-               retval = setFirst(set, &item);
-               while (retval) {
-                       DRM_DEBUG("free video memory 0x%lx\n", item);
-#if defined(__linux__) && defined(CONFIG_FB_SIS)
-                       sis_free(item);
-#else
-                       mmFreeMem((PMemBlock) item);
-#endif
-                       retval = setNext(set, &item);
-               }
-               setDestroy(set);
-
-               /* AGP Memory */
-               set = global_ppriv[i].sets[1];
-               retval = setFirst(set, &item);
-               while (retval) {
-                       DRM_DEBUG("free agp memory 0x%lx\n", item);
-                       mmFreeMem((PMemBlock) item);
-                       retval = setNext(set, &item);
-               }
-               setDestroy(set);
-
-               global_ppriv[i].used = 0;
+       if (dev->driver->dma_quiescent) {
+               dev->driver->dma_quiescent(dev);
        }
 
-       return 1;
+       drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)priv);
+       mutex_unlock(&dev->struct_mutex);
+       return;
 }
 
 drm_ioctl_desc_t sis_ioctls[] = {
        [DRM_IOCTL_NR(DRM_SIS_FB_ALLOC)] = {sis_fb_alloc, DRM_AUTH},
-       [DRM_IOCTL_NR(DRM_SIS_FB_FREE)] = {sis_fb_free, DRM_AUTH},
-       [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)] = {sis_ioctl_agp_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
+       [DRM_IOCTL_NR(DRM_SIS_FB_FREE)] = {sis_drm_free, DRM_AUTH},
+       [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)] =
+           {sis_ioctl_agp_init, DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY},
        [DRM_IOCTL_NR(DRM_SIS_AGP_ALLOC)] = {sis_ioctl_agp_alloc, DRM_AUTH},
-       [DRM_IOCTL_NR(DRM_SIS_AGP_FREE)] = {sis_ioctl_agp_free, DRM_AUTH},
-       [DRM_IOCTL_NR(DRM_SIS_FB_INIT)] = {sis_fb_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}
+       [DRM_IOCTL_NR(DRM_SIS_AGP_FREE)] = {sis_drm_free, DRM_AUTH},
+       [DRM_IOCTL_NR(DRM_SIS_FB_INIT)] =
+           {sis_fb_init, DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY}
 };
 
 int sis_max_ioctl = DRM_ARRAY_SIZE(sis_ioctls);
index b3d364d793d748bf06eeb9833fbada3b38dff0b0..bb9dde8b1911138445caf8cbf665f479dfc1fe42 100644 (file)
@@ -43,7 +43,6 @@ static struct drm_driver driver = {
            DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
        .load = via_driver_load,
        .unload = via_driver_unload,
-       .context_ctor = via_init_context,
        .context_dtor = via_final_context,
        .vblank_wait = via_driver_vblank_wait,
        .irq_preinstall = via_driver_irq_preinstall,
@@ -53,6 +52,8 @@ static struct drm_driver driver = {
        .dma_quiescent = via_driver_dma_quiescent,
        .dri_library_name = dri_library_name,
        .reclaim_buffers = drm_core_reclaim_buffers,
+       .reclaim_buffers_locked = via_reclaim_buffers_locked,
+       .lastclose = via_lastclose,
        .get_map_ofs = drm_core_get_map_ofs,
        .get_reg_ofs = drm_core_get_reg_ofs,
        .ioctls = via_ioctls,
index 52bcc7b1ba4560065be1a85eb981b15e5a46aea8..d21b5b75da0fa944153fe1a7134670dd44f6606b 100644 (file)
 #ifndef _VIA_DRV_H_
 #define _VIA_DRV_H_
 
+#include "drm_sman.h"
 #define DRIVER_AUTHOR  "Various"
 
 #define DRIVER_NAME            "via"
 #define DRIVER_DESC            "VIA Unichrome / Pro"
-#define DRIVER_DATE            "20051116"
+#define DRIVER_DATE            "20060529"
 
 #define DRIVER_MAJOR           2
-#define DRIVER_MINOR           7
-#define DRIVER_PATCHLEVEL      4
+#define DRIVER_MINOR           10
+#define DRIVER_PATCHLEVEL      0
 
 #include "via_verifier.h"
 
@@ -85,6 +86,12 @@ typedef struct drm_via_private {
        uint32_t irq_enable_mask;
        uint32_t irq_pending_mask;
        int *irq_map;
+       unsigned int idle_fault;
+       drm_sman_t sman;
+       int vram_initialized;
+       int agp_initialized;
+       unsigned long vram_offset;
+       unsigned long agp_offset;
        drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES];
 } drm_via_private_t;
 
@@ -135,6 +142,9 @@ extern void via_init_futex(drm_via_private_t * dev_priv);
 extern void via_cleanup_futex(drm_via_private_t * dev_priv);
 extern void via_release_futex(drm_via_private_t * dev_priv, int context);
 
+extern void via_reclaim_buffers_locked(drm_device_t *dev, struct file *filp);
+extern void via_lastclose(drm_device_t *dev);
+
 extern void via_dmablit_handler(drm_device_t *dev, int engine, int from_irq);
 extern void via_init_dmablit(drm_device_t *dev);
 
diff --git a/drivers/char/drm/via_ds.c b/drivers/char/drm/via_ds.c
deleted file mode 100644 (file)
index 9429736..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
- *
- * 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, sub license,
- * 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, 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.
- */
-#include "drmP.h"
-
-#include "via_ds.h"
-extern unsigned int VIA_DEBUG;
-
-set_t *via_setInit(void)
-{
-       int i;
-       set_t *set;
-       set = (set_t *) drm_alloc(sizeof(set_t), DRM_MEM_DRIVER);
-       for (i = 0; i < SET_SIZE; i++) {
-               set->list[i].free_next = i + 1;
-               set->list[i].alloc_next = -1;
-       }
-       set->list[SET_SIZE - 1].free_next = -1;
-       set->free = 0;
-       set->alloc = -1;
-       set->trace = -1;
-       return set;
-}
-
-int via_setAdd(set_t * set, ITEM_TYPE item)
-{
-       int free = set->free;
-       if (free != -1) {
-               set->list[free].val = item;
-               set->free = set->list[free].free_next;
-       } else {
-               return 0;
-       }
-       set->list[free].alloc_next = set->alloc;
-       set->alloc = free;
-       set->list[free].free_next = -1;
-       return 1;
-}
-
-int via_setDel(set_t * set, ITEM_TYPE item)
-{
-       int alloc = set->alloc;
-       int prev = -1;
-
-       while (alloc != -1) {
-               if (set->list[alloc].val == item) {
-                       if (prev != -1)
-                               set->list[prev].alloc_next =
-                                   set->list[alloc].alloc_next;
-                       else
-                               set->alloc = set->list[alloc].alloc_next;
-                       break;
-               }
-               prev = alloc;
-               alloc = set->list[alloc].alloc_next;
-       }
-
-       if (alloc == -1)
-               return 0;
-
-       set->list[alloc].free_next = set->free;
-       set->free = alloc;
-       set->list[alloc].alloc_next = -1;
-
-       return 1;
-}
-
-/* setFirst -> setAdd -> setNext is wrong */
-
-int via_setFirst(set_t * set, ITEM_TYPE * item)
-{
-       if (set->alloc == -1)
-               return 0;
-
-       *item = set->list[set->alloc].val;
-       set->trace = set->list[set->alloc].alloc_next;
-
-       return 1;
-}
-
-int via_setNext(set_t * set, ITEM_TYPE * item)
-{
-       if (set->trace == -1)
-               return 0;
-
-       *item = set->list[set->trace].val;
-       set->trace = set->list[set->trace].alloc_next;
-
-       return 1;
-}
-
-int via_setDestroy(set_t * set)
-{
-       drm_free(set, sizeof(set_t), DRM_MEM_DRIVER);
-
-       return 1;
-}
-
-#define ISFREE(bptr) ((bptr)->free)
-
-#define fprintf(fmt, arg...) do{}while(0)
-
-memHeap_t *via_mmInit(int ofs, int size)
-{
-       PMemBlock blocks;
-
-       if (size <= 0)
-               return NULL;
-
-       blocks = (TMemBlock *) drm_calloc(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
-
-       if (blocks) {
-               blocks->ofs = ofs;
-               blocks->size = size;
-               blocks->free = 1;
-               return (memHeap_t *) blocks;
-       } else
-               return NULL;
-}
-
-static TMemBlock *SliceBlock(TMemBlock * p,
-                            int startofs, int size,
-                            int reserved, int alignment)
-{
-       TMemBlock *newblock;
-
-       /* break left */
-       if (startofs > p->ofs) {
-               newblock =
-                   (TMemBlock *) drm_calloc(1, sizeof(TMemBlock),
-                                            DRM_MEM_DRIVER);
-               newblock->ofs = startofs;
-               newblock->size = p->size - (startofs - p->ofs);
-               newblock->free = 1;
-               newblock->next = p->next;
-               p->size -= newblock->size;
-               p->next = newblock;
-               p = newblock;
-       }
-
-       /* break right */
-       if (size < p->size) {
-               newblock =
-                   (TMemBlock *) drm_calloc(1, sizeof(TMemBlock),
-                                            DRM_MEM_DRIVER);
-               newblock->ofs = startofs + size;
-               newblock->size = p->size - size;
-               newblock->free = 1;
-               newblock->next = p->next;
-               p->size = size;
-               p->next = newblock;
-       }
-
-       /* p = middle block */
-       p->align = alignment;
-       p->free = 0;
-       p->reserved = reserved;
-       return p;
-}
-
-PMemBlock via_mmAllocMem(memHeap_t * heap, int size, int align2,
-                        int startSearch)
-{
-       int mask, startofs, endofs;
-       TMemBlock *p;
-
-       if (!heap || align2 < 0 || size <= 0)
-               return NULL;
-
-       mask = (1 << align2) - 1;
-       startofs = 0;
-       p = (TMemBlock *) heap;
-
-       while (p) {
-               if (ISFREE(p)) {
-                       startofs = (p->ofs + mask) & ~mask;
-
-                       if (startofs < startSearch)
-                               startofs = startSearch;
-
-                       endofs = startofs + size;
-
-                       if (endofs <= (p->ofs + p->size))
-                               break;
-               }
-
-               p = p->next;
-       }
-
-       if (!p)
-               return NULL;
-
-       p = SliceBlock(p, startofs, size, 0, mask + 1);
-       p->heap = heap;
-
-       return p;
-}
-
-static __inline__ int Join2Blocks(TMemBlock * p)
-{
-       if (p->free && p->next && p->next->free) {
-               TMemBlock *q = p->next;
-               p->size += q->size;
-               p->next = q->next;
-               drm_free(q, sizeof(TMemBlock), DRM_MEM_DRIVER);
-
-               return 1;
-       }
-
-       return 0;
-}
-
-int via_mmFreeMem(PMemBlock b)
-{
-       TMemBlock *p, *prev;
-
-       if (!b)
-               return 0;
-
-       if (!b->heap) {
-               fprintf(stderr, "no heap\n");
-
-               return -1;
-       }
-
-       p = b->heap;
-       prev = NULL;
-
-       while (p && p != b) {
-               prev = p;
-               p = p->next;
-       }
-
-       if (!p || p->free || p->reserved) {
-               if (!p)
-                       fprintf(stderr, "block not found in heap\n");
-               else if (p->free)
-                       fprintf(stderr, "block already free\n");
-               else
-                       fprintf(stderr, "block is reserved\n");
-
-               return -1;
-       }
-
-       p->free = 1;
-       Join2Blocks(p);
-
-       if (prev)
-               Join2Blocks(prev);
-
-       return 0;
-}
diff --git a/drivers/char/drm/via_ds.h b/drivers/char/drm/via_ds.h
deleted file mode 100644 (file)
index d2bb9f3..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
- * 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, sub license,
- * 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, 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.
- */
-#ifndef _via_ds_h_
-#define _via_ds_h_
-
-#include "drmP.h"
-
-/* Set Data Structure */
-#define SET_SIZE 5000
-typedef unsigned long ITEM_TYPE;
-
-typedef struct {
-       ITEM_TYPE val;
-       int alloc_next, free_next;
-} list_item_t;
-
-typedef struct {
-       int alloc;
-       int free;
-       int trace;
-       list_item_t list[SET_SIZE];
-} set_t;
-
-set_t *via_setInit(void);
-int via_setAdd(set_t * set, ITEM_TYPE item);
-int via_setDel(set_t * set, ITEM_TYPE item);
-int via_setFirst(set_t * set, ITEM_TYPE * item);
-int via_setNext(set_t * set, ITEM_TYPE * item);
-int via_setDestroy(set_t * set);
-
-#endif
-
-#ifndef MM_INC
-#define MM_INC
-
-struct mem_block_t {
-       struct mem_block_t *next;
-       struct mem_block_t *heap;
-       int ofs, size;
-       int align;
-       unsigned int free:1;
-       unsigned int reserved:1;
-};
-typedef struct mem_block_t TMemBlock;
-typedef struct mem_block_t *PMemBlock;
-
-/* a heap is just the first block in a chain */
-typedef struct mem_block_t memHeap_t;
-
-static __inline__ int mmBlockSize(PMemBlock b)
-{
-       return b->size;
-}
-
-static __inline__ int mmOffset(PMemBlock b)
-{
-       return b->ofs;
-}
-
-static __inline__ void mmMarkReserved(PMemBlock b)
-{
-       b->reserved = 1;
-}
-
-/*
- * input: total size in bytes
- * return: a heap pointer if OK, NULL if error
- */
-memHeap_t *via_mmInit(int ofs, int size);
-
-PMemBlock via_mmAllocMem(memHeap_t * heap, int size, int align2,
-                        int startSearch);
-
-/*
- * Free block starts at offset
- * input: pointer to a block
- * return: 0 if OK, -1 if error
- */
-int via_mmFreeMem(PMemBlock b);
-
-#endif
index c6a08e96285bf55c62a96480c7989ea0632a7419..782011e0a58d49efb209593d0896dacd030cdde9 100644 (file)
@@ -98,6 +98,7 @@ int via_map_init(DRM_IOCTL_ARGS)
 int via_driver_load(drm_device_t *dev, unsigned long chipset)
 {
        drm_via_private_t *dev_priv;
+       int ret = 0;
 
        dev_priv = drm_calloc(1, sizeof(drm_via_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
@@ -108,13 +109,19 @@ int via_driver_load(drm_device_t *dev, unsigned long chipset)
        if (chipset == VIA_PRO_GROUP_A)
                dev_priv->pro_group_a = 1;
 
-       return 0;
+       ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
+       if (ret) {
+               drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
+       }
+       return ret;
 }
 
 int via_driver_unload(drm_device_t *dev)
 {
        drm_via_private_t *dev_priv = dev->dev_private;
 
+       drm_sman_takedown(&dev_priv->sman);
+
        drm_free(dev_priv, sizeof(drm_via_private_t), DRM_MEM_DRIVER);
 
        return 0;
index 33e0cb12e4c30dd448365847421b9266f8ac71c5..9d9237ef94482c0a6f98940df14b19a13ef0a46f 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ * Copyright 2006 Tungsten Graphics Inc., Bismarck, ND., USA.
+ * 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"),
  * 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * THE AUTHORS OR COPYRIGHT HOLDERS AND/OR THEIR 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: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ */
+
 #include "drmP.h"
 #include "via_drm.h"
 #include "via_drv.h"
-#include "via_ds.h"
-#include "via_mm.h"
-
-#define MAX_CONTEXT 100
-
-typedef struct {
-       int used;
-       int context;
-       set_t *sets[2];         /* 0 for frame buffer, 1 for AGP , 2 for System */
-} via_context_t;
-
-static via_context_t global_ppriv[MAX_CONTEXT];
+#include "drm_sman.h"
 
-static int via_agp_alloc(drm_via_mem_t * mem);
-static int via_agp_free(drm_via_mem_t * mem);
-static int via_fb_alloc(drm_via_mem_t * mem);
-static int via_fb_free(drm_via_mem_t * mem);
-
-static int add_alloc_set(int context, int type, unsigned long val)
-{
-       int i, retval = 0;
-
-       for (i = 0; i < MAX_CONTEXT; i++) {
-               if (global_ppriv[i].used && global_ppriv[i].context == context) {
-                       retval = via_setAdd(global_ppriv[i].sets[type], val);
-                       break;
-               }
-       }
-
-       return retval;
-}
-
-static int del_alloc_set(int context, int type, unsigned long val)
-{
-       int i, retval = 0;
-
-       for (i = 0; i < MAX_CONTEXT; i++)
-               if (global_ppriv[i].used && global_ppriv[i].context == context) {
-                       retval = via_setDel(global_ppriv[i].sets[type], val);
-                       break;
-               }
-
-       return retval;
-}
-
-/* agp memory management */
-static memHeap_t *AgpHeap = NULL;
+#define VIA_MM_ALIGN_SHIFT 4
+#define VIA_MM_ALIGN_MASK ( (1 << VIA_MM_ALIGN_SHIFT) - 1)
 
 int via_agp_init(DRM_IOCTL_ARGS)
 {
+       DRM_DEVICE;
        drm_via_agp_t agp;
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+       int ret;
 
        DRM_COPY_FROM_USER_IOCTL(agp, (drm_via_agp_t __user *) data,
                                 sizeof(agp));
+       mutex_lock(&dev->struct_mutex);
+       ret = drm_sman_set_range(&dev_priv->sman, VIA_MEM_AGP, 0,
+                                agp.size >> VIA_MM_ALIGN_SHIFT);
+
+       if (ret) {
+               DRM_ERROR("AGP memory manager initialisation error\n");
+               mutex_unlock(&dev->struct_mutex);
+               return ret;
+       }
 
-       AgpHeap = via_mmInit(agp.offset, agp.size);
-
-       DRM_DEBUG("offset = %lu, size = %lu", (unsigned long)agp.offset,
-                 (unsigned long)agp.size);
+       dev_priv->agp_initialized = TRUE;
+       dev_priv->agp_offset = agp.offset;
+       mutex_unlock(&dev->struct_mutex);
 
+       DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size);
        return 0;
 }
 
-/* fb memory management */
-static memHeap_t *FBHeap = NULL;
-
 int via_fb_init(DRM_IOCTL_ARGS)
 {
+       DRM_DEVICE;
        drm_via_fb_t fb;
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+       int ret;
 
        DRM_COPY_FROM_USER_IOCTL(fb, (drm_via_fb_t __user *) data, sizeof(fb));
 
-       FBHeap = via_mmInit(fb.offset, fb.size);
+       mutex_lock(&dev->struct_mutex);
+       ret = drm_sman_set_range(&dev_priv->sman, VIA_MEM_VIDEO, 0,
+                                fb.size >> VIA_MM_ALIGN_SHIFT);
 
-       DRM_DEBUG("offset = %lu, size = %lu", (unsigned long)fb.offset,
-                 (unsigned long)fb.size);
+       if (ret) {
+               DRM_ERROR("VRAM memory manager initialisation error\n");
+               mutex_unlock(&dev->struct_mutex);
+               return ret;
+       }
 
-       return 0;
-}
+       dev_priv->vram_initialized = TRUE;
+       dev_priv->vram_offset = fb.offset;
 
-int via_init_context(struct drm_device *dev, int context)
-{
-       int i;
-
-       for (i = 0; i < MAX_CONTEXT; i++)
-               if (global_ppriv[i].used &&
-                   (global_ppriv[i].context == context))
-                       break;
-
-       if (i >= MAX_CONTEXT) {
-               for (i = 0; i < MAX_CONTEXT; i++) {
-                       if (!global_ppriv[i].used) {
-                               global_ppriv[i].context = context;
-                               global_ppriv[i].used = 1;
-                               global_ppriv[i].sets[0] = via_setInit();
-                               global_ppriv[i].sets[1] = via_setInit();
-                               DRM_DEBUG("init allocation set, socket=%d,"
-                                         " context = %d\n", i, context);
-                               break;
-                       }
-               }
-
-               if ((i >= MAX_CONTEXT) || (global_ppriv[i].sets[0] == NULL) ||
-                   (global_ppriv[i].sets[1] == NULL)) {
-                       return 0;
-               }
-       }
+       mutex_unlock(&dev->struct_mutex);
+       DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size);
+
+       return 0;
 
-       return 1;
 }
 
 int via_final_context(struct drm_device *dev, int context)
 {
-       int i;
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 
-       for (i = 0; i < MAX_CONTEXT; i++)
-               if (global_ppriv[i].used &&
-                   (global_ppriv[i].context == context))
-                       break;
-
-       if (i < MAX_CONTEXT) {
-               set_t *set;
-               ITEM_TYPE item;
-               int retval;
-
-               DRM_DEBUG("find socket %d, context = %d\n", i, context);
-
-               /* Video Memory */
-               set = global_ppriv[i].sets[0];
-               retval = via_setFirst(set, &item);
-               while (retval) {
-                       DRM_DEBUG("free video memory 0x%lx\n", item);
-                       via_mmFreeMem((PMemBlock) item);
-                       retval = via_setNext(set, &item);
-               }
-               via_setDestroy(set);
-
-               /* AGP Memory */
-               set = global_ppriv[i].sets[1];
-               retval = via_setFirst(set, &item);
-               while (retval) {
-                       DRM_DEBUG("free agp memory 0x%lx\n", item);
-                       via_mmFreeMem((PMemBlock) item);
-                       retval = via_setNext(set, &item);
-               }
-               via_setDestroy(set);
-               global_ppriv[i].used = 0;
-       }
        via_release_futex(dev_priv, context);
 
-#if defined(__linux__)
        /* Linux specific until context tracking code gets ported to BSD */
        /* Last context, perform cleanup */
        if (dev->ctx_count == 1 && dev->dev_private) {
                DRM_DEBUG("Last Context\n");
                if (dev->irq)
                        drm_irq_uninstall(dev);
-
                via_cleanup_futex(dev_priv);
                via_do_cleanup_map(dev);
        }
-#endif
-
        return 1;
 }
 
+void via_lastclose(struct drm_device *dev)
+{
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+
+       if (!dev_priv)
+               return;
+
+       mutex_lock(&dev->struct_mutex);
+       drm_sman_cleanup(&dev_priv->sman);
+       dev_priv->vram_initialized = FALSE;
+       dev_priv->agp_initialized = FALSE;
+       mutex_unlock(&dev->struct_mutex);
+}      
+
 int via_mem_alloc(DRM_IOCTL_ARGS)
 {
+       DRM_DEVICE;
+
        drm_via_mem_t mem;
+       int retval = 0;
+       drm_memblock_item_t *item;
+       drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+       unsigned long tmpSize;
 
        DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
                                 sizeof(mem));
 
-       switch (mem.type) {
-       case VIA_MEM_VIDEO:
-               if (via_fb_alloc(&mem) < 0)
-                       return -EFAULT;
-               DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem,
-                                      sizeof(mem));
-               return 0;
-       case VIA_MEM_AGP:
-               if (via_agp_alloc(&mem) < 0)
-                       return -EFAULT;
-               DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem,
-                                      sizeof(mem));
-               return 0;
+       if (mem.type > VIA_MEM_AGP) {
+               DRM_ERROR("Unknown memory type allocation\n");
+               return DRM_ERR(EINVAL);
        }
-
-       return -EFAULT;
-}
-
-static int via_fb_alloc(drm_via_mem_t * mem)
-{
-       drm_via_mm_t fb;
-       PMemBlock block;
-       int retval = 0;
-
-       if (!FBHeap)
-               return -1;
-
-       fb.size = mem->size;
-       fb.context = mem->context;
-
-       block = via_mmAllocMem(FBHeap, fb.size, 5, 0);
-       if (block) {
-               fb.offset = block->ofs;
-               fb.free = (unsigned long)block;
-               if (!add_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) {
-                       DRM_DEBUG("adding to allocation set fails\n");
-                       via_mmFreeMem((PMemBlock) fb.free);
-                       retval = -1;
-               }
-       } else {
-               fb.offset = 0;
-               fb.size = 0;
-               fb.free = 0;
-               retval = -1;
+       mutex_lock(&dev->struct_mutex);
+       if (FALSE == ((mem.type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
+                     dev_priv->agp_initialized)) {
+               DRM_ERROR
+                   ("Attempt to allocate from uninitialized memory manager.\n");
+               mutex_unlock(&dev->struct_mutex);
+               return DRM_ERR(EINVAL);
        }
 
-       mem->offset = fb.offset;
-       mem->index = fb.free;
-
-       DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size,
-                 (int)fb.offset);
-
-       return retval;
-}
-
-static int via_agp_alloc(drm_via_mem_t * mem)
-{
-       drm_via_mm_t agp;
-       PMemBlock block;
-       int retval = 0;
-
-       if (!AgpHeap)
-               return -1;
-
-       agp.size = mem->size;
-       agp.context = mem->context;
-
-       block = via_mmAllocMem(AgpHeap, agp.size, 5, 0);
-       if (block) {
-               agp.offset = block->ofs;
-               agp.free = (unsigned long)block;
-               if (!add_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) {
-                       DRM_DEBUG("adding to allocation set fails\n");
-                       via_mmFreeMem((PMemBlock) agp.free);
-                       retval = -1;
-               }
+       tmpSize = (mem.size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
+       item = drm_sman_alloc(&dev_priv->sman, mem.type, tmpSize, 0,
+                             (unsigned long)priv);
+       mutex_unlock(&dev->struct_mutex);
+       if (item) {
+               mem.offset = ((mem.type == VIA_MEM_VIDEO) ?
+                             dev_priv->vram_offset : dev_priv->agp_offset) +
+                   (item->mm->
+                    offset(item->mm, item->mm_info) << VIA_MM_ALIGN_SHIFT);
+               mem.index = item->user_hash.key;
        } else {
-               agp.offset = 0;
-               agp.size = 0;
-               agp.free = 0;
+               mem.offset = 0;
+               mem.size = 0;
+               mem.index = 0;
+               DRM_DEBUG("Video memory allocation failed\n");
+               retval = DRM_ERR(ENOMEM);
        }
+       DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, sizeof(mem));
 
-       mem->offset = agp.offset;
-       mem->index = agp.free;
-
-       DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size,
-                 (unsigned int)agp.offset);
        return retval;
 }
 
 int via_mem_free(DRM_IOCTL_ARGS)
 {
+       DRM_DEVICE;
+       drm_via_private_t *dev_priv = dev->dev_private;
        drm_via_mem_t mem;
+       int ret;
 
        DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
                                 sizeof(mem));
 
-       switch (mem.type) {
+       mutex_lock(&dev->struct_mutex);
+       ret = drm_sman_free_key(&dev_priv->sman, mem.index);
+       mutex_unlock(&dev->struct_mutex);
+       DRM_DEBUG("free = 0x%lx\n", mem.index);
 
-       case VIA_MEM_VIDEO:
-               if (via_fb_free(&mem) == 0)
-                       return 0;
-               break;
-       case VIA_MEM_AGP:
-               if (via_agp_free(&mem) == 0)
-                       return 0;
-               break;
-       }
-
-       return -EFAULT;
+       return ret;
 }
 
-static int via_fb_free(drm_via_mem_t * mem)
-{
-       drm_via_mm_t fb;
-       int retval = 0;
-
-       if (!FBHeap) {
-               return -1;
-       }
-
-       fb.free = mem->index;
-       fb.context = mem->context;
-
-       if (!fb.free) {
-               return -1;
-
-       }
-
-       via_mmFreeMem((PMemBlock) fb.free);
-
-       if (!del_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) {
-               retval = -1;
-       }
-
-       DRM_DEBUG("free fb, free = %ld\n", fb.free);
 
-       return retval;
-}
-
-static int via_agp_free(drm_via_mem_t * mem)
+void via_reclaim_buffers_locked(drm_device_t * dev, struct file *filp)
 {
-       drm_via_mm_t agp;
-
-       int retval = 0;
+       drm_via_private_t *dev_priv = dev->dev_private;
+       drm_file_t *priv = filp->private_data;
 
-       agp.free = mem->index;
-       agp.context = mem->context;
-
-       if (!agp.free)
-               return -1;
-
-       via_mmFreeMem((PMemBlock) agp.free);
-
-       if (!del_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) {
-               retval = -1;
+       mutex_lock(&dev->struct_mutex);
+       if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) {
+               mutex_unlock(&dev->struct_mutex);
+               return;
        }
 
-       DRM_DEBUG("free agp, free = %ld\n", agp.free);
+       if (dev->driver->dma_quiescent) {
+               dev->driver->dma_quiescent(dev);
+       }
 
-       return retval;
+       drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)priv);
+       mutex_unlock(&dev->struct_mutex);
+       return;
 }