diff options
| author | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
| commit | 44aa4d6297874022a4f5a49ea24f2d052584d3dc (patch) | |
| tree | a3b8646dd51527d2fb246dbc11a124f4fd60968a /linux/sis_mm.c | |
| parent | 14945ada16218e9f918c24e0d702979fae9b07f6 (diff) | |
First pass merge of XFree86 4.2.0 import.X_4_2_0-20020128-merge
Diffstat (limited to 'linux/sis_mm.c')
| -rw-r--r-- | linux/sis_mm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/linux/sis_mm.c b/linux/sis_mm.c index 2c2e0d95..81832769 100644 --- a/linux/sis_mm.c +++ b/linux/sis_mm.c @@ -72,7 +72,7 @@ static int del_alloc_set(int context, int type, unsigned int val) } /* fb management via fb device */ -#if 0 +#if 1 int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { @@ -90,7 +90,7 @@ int sis_fb_alloc(struct inode *inode, struct file *filp, unsigned int cmd, 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"); + DRM_DEBUG("adding to allocation set fails\n"); sis_free(req.offset); retval = -1; } @@ -185,7 +185,7 @@ int sisp_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd, agp.offset = block->ofs; agp.free = (unsigned int)block; if(!add_alloc_set(agp.context, AGP_TYPE, agp.free)){ - DRM_DEBUG("adding to allocation set fails"); + DRM_DEBUG("adding to allocation set fails\n"); mmFreeMem((PMemBlock)agp.free); retval = -1; } @@ -279,9 +279,7 @@ int sis_final_context(int context) retval = setFirst(set, &item); while(retval){ DRM_DEBUG("free video memory 0x%x\n", item); -#if 0 sis_free(item); -#endif retval = setNext(set, &item); } setDestroy(set); |