From b7760039d7d7ef60b289b24ff5622b901c24fb16 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Tue, 3 Jun 2003 11:23:58 +0000 Subject: First pass at support for agp allocator in i830 driver --- linux-core/Makefile.kernel | 2 +- linux-core/i830_dma.c | 8 +- linux-core/i830_drm.h | 28 ++++ linux-core/i830_drv.h | 89 +++++------ linux/Makefile.kernel | 2 +- linux/i830.h | 27 +++- linux/i830_compat.c | 22 +-- linux/i830_dma.c | 8 +- linux/i830_drm.h | 28 ++++ linux/i830_drv.h | 89 +++++------ linux/i830_mem.c | 382 +++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 576 insertions(+), 109 deletions(-) create mode 100644 linux/i830_mem.c diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index a2018fae..72d69a02 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -12,7 +12,7 @@ tdfx-objs := tdfx_drv.o r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o -i830-objs := i830_drv.o i830_dma.o i830_irq.o i830_compat.o +i830-objs := i830_drv.o i830_dma.o i830_irq.o i830_compat.o i830_mem.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o sis-objs := sis_drv.o sis_ds.o sis_mm.o ffb-objs := ffb_drv.o ffb_context.o diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c index 28af8593..0e4251d3 100644 --- a/linux-core/i830_dma.c +++ b/linux-core/i830_dma.c @@ -1196,7 +1196,7 @@ static int i830_dma_dispatch_vertex2(drm_device_t *dev, OUT_RING( (start<<5) | 1 ); ADVANCE_LP_RING(); #else - /* 845 ONLY: */ + /* 845 ONLY, and subject to some lockups: */ BEGIN_LP_RING(2); OUT_RING( MI_VERTEX_BUFFER ); OUT_RING( start ); @@ -1603,6 +1603,12 @@ int i830_setparam( DRM_IOCTL_ARGS ) case I830_SETPARAM_USE_MI_BATCHBUFFER_START: dev_priv->use_mi_batchbuffer_start = param.value; break; + case I830_SETPARAM_TEX_LRU_LOG_GRANULARITY: + dev_priv->tex_lru_log_granularity = param.value; + break; + case I830_SETPARAM_TEX_LRU_NR_REGIONS: + dev_priv->tex_lru_nr_regions = param.value; + break; default: return DRM_ERR(EINVAL); } diff --git a/linux-core/i830_drm.h b/linux-core/i830_drm.h index 2e09c53e..28e02e89 100644 --- a/linux-core/i830_drm.h +++ b/linux-core/i830_drm.h @@ -267,6 +267,9 @@ typedef struct _drm_i830_sarea { #define DRM_IOCTL_I830_SETPARAM DRM_IOWR(0x4d, drm_i830_setparam_t) #define DRM_IOCTL_I830_GETBUF2 DRM_IOWR(0x4e, drm_i830_dma_t) #define DRM_IOCTL_I830_VERTEX2 DRM_IOW( 0x4f, drm_i830_vertex_t) +#define DRM_IOCTL_I830_ALLOC DRM_IOWR(0x50, drm_i830_mem_alloc_t) +#define DRM_IOCTL_I830_FREE DRM_IOW( 0x51, drm_i830_mem_free_t) +#define DRM_IOCTL_I830_INIT_HEAP DRM_IOW( 0x52, drm_i830_mem_init_heap_t) typedef struct _drm_i830_clear { int clear_color; @@ -327,11 +330,36 @@ typedef struct drm_i830_getparam { /* 1.3: New ioctl to set kernel params: */ #define I830_SETPARAM_USE_MI_BATCHBUFFER_START 1 +#define I830_SETPARAM_PERF_BOXES 2 +#define I830_SETPARAM_TEX_LRU_LOG_GRANULARITY 3 +#define I830_SETPARAM_TEX_LRU_NR_REGIONS 4 typedef struct drm_i830_setparam { int param; int value; } drm_i830_setparam_t; +/* 1.4: Set up a memory manager for regions of shared memory: + */ +#define I830_MEM_REGION_AGP 1 + +typedef struct drm_i830_mem_alloc { + int region; + int alignment; + int size; + int *region_offset; /* offset from start of fb or agp */ +} drm_i830_mem_alloc_t; + +typedef struct drm_i830_mem_free { + int region; + int region_offset; +} drm_i830_mem_free_t; + +typedef struct drm_i830_mem_init_heap { + int region; + int size; + int start; +} drm_i830_mem_init_heap_t; + #endif /* _I830_DRM_H_ */ diff --git a/linux-core/i830_drv.h b/linux-core/i830_drv.h index 9ba912fd..0849871e 100644 --- a/linux-core/i830_drv.h +++ b/linux-core/i830_drv.h @@ -51,6 +51,14 @@ typedef struct _drm_i830_ring_buffer{ int space; } drm_i830_ring_buffer_t; +struct mem_block { + struct mem_block *next; + struct mem_block *prev; + int start; + int size; + DRMFILE filp; /* 0: free, -1: heap, other: real files */ +}; + typedef struct drm_i830_private { drm_map_t *sarea_map; drm_map_t *buffer_map; @@ -88,63 +96,50 @@ typedef struct drm_i830_private { atomic_t irq_emitted; int use_mi_batchbuffer_start; + int tex_lru_log_granularity; + int tex_lru_nr_regions; + + struct mem_block *agp_heap; } drm_i830_private_t; /* i830_dma.c */ extern int i830_dma_schedule(drm_device_t *dev, int locked); -extern int i830_getbuf(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern int i830_getbuf2(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern int i830_dma_init(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int i830_dma_cleanup(drm_device_t *dev); -extern int i830_flush_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern void i830_reclaim_buffers(struct file *filp); -extern int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd, - unsigned long arg); -extern int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma); -extern int i830_copybuf(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern int i830_docopy(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - extern void i830_dma_quiescent(drm_device_t *dev); - -extern int i830_dma_vertex(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_dma_vertex2(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_swap_bufs(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_clear_bufs(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_flip_bufs(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_getparam( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); - -extern int i830_setparam( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); +extern void i830_reclaim_buffers( DRMFILE filp); + +extern int i830_getbuf( DRM_IOCTL_ARGS ); +extern int i830_getbuf2( DRM_IOCTL_ARGS ); +extern int i830_dma_init( DRM_IOCTL_ARGS ); +extern int i830_flush_ioctl( DRM_IOCTL_ARGS ); +extern int i830_getage( DRM_IOCTL_ARGS ); +extern int i830_copybuf( DRM_IOCTL_ARGS ); +extern int i830_docopy( DRM_IOCTL_ARGS ); +extern int i830_dma_vertex( DRM_IOCTL_ARGS ); +extern int i830_dma_vertex2( DRM_IOCTL_ARGS ); +extern int i830_swap_bufs( DRM_IOCTL_ARGS ); +extern int i830_clear_bufs( DRM_IOCTL_ARGS ); +extern int i830_flip_bufs( DRM_IOCTL_ARGS ); +extern int i830_getparam( DRM_IOCTL_ARGS ); +extern int i830_setparam( DRM_IOCTL_ARGS ); /* i830_irq.c */ -extern int i830_irq_emit( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); -extern int i830_irq_wait( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); +extern int i830_irq_emit( DRM_IOCTL_ARGS ); +extern int i830_irq_wait( DRM_IOCTL_ARGS ); extern int i830_wait_irq(drm_device_t *dev, int irq_nr); extern int i830_emit_irq(drm_device_t *dev); -#define I830_BASE(reg) ((unsigned long) \ - dev_priv->mmio_map->handle) +/* i830_mem.c */ +extern int i830_mem_alloc( DRM_IOCTL_ARGS ); +extern int i830_mem_free( DRM_IOCTL_ARGS ); +extern int i830_mem_init_heap( DRM_IOCTL_ARGS ); +extern void i830_mem_takedown( struct mem_block **heap ); +extern void i830_mem_release( drm_device_t *dev, + DRMFILE filp, struct mem_block *heap ); + +#define I830_BASE(reg) ((unsigned long) dev_priv->mmio_map->handle) #define I830_ADDR(reg) (I830_BASE(reg) + reg) #define I830_DEREF(reg) *(__volatile__ unsigned int *)I830_ADDR(reg) #define I830_READ(reg) readl((volatile u32 *)I830_ADDR(reg)) @@ -162,7 +157,7 @@ extern int i830_emit_irq(drm_device_t *dev); #define BEGIN_LP_RING(n) do { \ if (I830_VERBOSE) \ - printk("BEGIN_LP_RING(%d) in %s\n", \ + DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \ n, __FUNCTION__); \ if (dev_priv->ring.space < n*4) \ i830_wait_ring(dev, n*4, __FUNCTION__); \ @@ -174,7 +169,7 @@ extern int i830_emit_irq(drm_device_t *dev); #define OUT_RING(n) do { \ - if (I830_VERBOSE) printk(" OUT_RING %x\n", (int)(n)); \ + if (I830_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \ *(volatile unsigned int *)(virt + outring) = n; \ outcount++; \ outring += 4; \ @@ -182,7 +177,7 @@ extern int i830_emit_irq(drm_device_t *dev); } while (0) #define ADVANCE_LP_RING() do { \ - if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring); \ + if (I830_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING %x\n", outring); \ dev_priv->ring.tail = outring; \ dev_priv->ring.space -= outcount * 4; \ I830_WRITE(LP_RING + RING_TAIL, outring); \ diff --git a/linux/Makefile.kernel b/linux/Makefile.kernel index a2018fae..72d69a02 100644 --- a/linux/Makefile.kernel +++ b/linux/Makefile.kernel @@ -12,7 +12,7 @@ tdfx-objs := tdfx_drv.o r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o i810-objs := i810_drv.o i810_dma.o -i830-objs := i830_drv.o i830_dma.o i830_irq.o i830_compat.o +i830-objs := i830_drv.o i830_dma.o i830_irq.o i830_compat.o i830_mem.o radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o sis-objs := sis_drv.o sis_ds.o sis_mm.o ffb-objs := ffb_drv.o ffb_context.o diff --git a/linux/i830.h b/linux/i830.h index 21321d86..88197c45 100644 --- a/linux/i830.h +++ b/linux/i830.h @@ -78,7 +78,11 @@ [DRM_IOCTL_NR(DRM_IOCTL_I830_GETPARAM)] = { i830_getparam, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_I830_SETPARAM)] = { i830_setparam, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_I830_GETBUF2)] = { i830_getbuf2, 1, 0 }, \ - [DRM_IOCTL_NR(DRM_IOCTL_I830_VERTEX2)] = { i830_dma_vertex2, 1, 0 } + [DRM_IOCTL_NR(DRM_IOCTL_I830_VERTEX2)] = { i830_dma_vertex2, 1, 0 }, \ + [DRM_IOCTL_NR(DRM_IOCTL_I830_ALLOC)] = { i830_mem_alloc, 1, 0 }, \ + [DRM_IOCTL_NR(DRM_IOCTL_I830_FREE)] = { i830_mem_free, 1, 0 }, \ + [DRM_IOCTL_NR(DRM_IOCTL_I830_INIT_HEAP)] = { i830_mem_init_heap, 1, 1 }, + #define __HAVE_COUNTERS 4 #define __HAVE_COUNTER6 _DRM_STAT_IRQ @@ -94,9 +98,30 @@ } while (0) #define DRIVER_PRETAKEDOWN() do { \ + if ( dev->dev_private ) { \ + drm_i830_private_t *dev_priv = dev->dev_private; \ + i830_mem_takedown( &(dev_priv->agp_heap) ); \ + } \ i830_dma_cleanup( dev ); \ } while (0) + +/* When a client dies: + * - Free any alloced agp memory. + * + * DRM infrastructure takes care of reclaiming dma buffers. + */ +#define DRIVER_PRERELEASE() \ +do { \ + if ( dev->dev_private ) { \ + drm_i830_private_t *dev_priv = dev->dev_private; \ + i830_mem_release( dev, filp, dev_priv->agp_heap ); \ + } \ +} while (0) + + + + /* DMA customization: */ #define __HAVE_DMA 1 diff --git a/linux/i830_compat.c b/linux/i830_compat.c index 213d0be7..5b126282 100644 --- a/linux/i830_compat.c +++ b/linux/i830_compat.c @@ -73,16 +73,7 @@ * stuff, and rely on a secure implementation of I830_VERTEX. */ -static struct file_operations i830_buffer_fops = { - .open = DRM(open), - .flush = DRM(flush), - .release = DRM(release), - .ioctl = DRM(ioctl), - .mmap = i830_mmap_buffers, - .fasync = DRM(fasync), -}; - -int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) +static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) { drm_file_t *priv = filp->private_data; drm_device_t *dev; @@ -109,6 +100,17 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) return 0; } +static struct file_operations i830_buffer_fops = { + .open = DRM(open), + .flush = DRM(flush), + .release = DRM(release), + .ioctl = DRM(ioctl), + .mmap = i830_mmap_buffers, + .fasync = DRM(fasync), +}; + + + static int i830_map_buffer(drm_buf_t *buf, struct file *filp) { drm_file_t *priv = filp->private_data; diff --git a/linux/i830_dma.c b/linux/i830_dma.c index 28af8593..0e4251d3 100644 --- a/linux/i830_dma.c +++ b/linux/i830_dma.c @@ -1196,7 +1196,7 @@ static int i830_dma_dispatch_vertex2(drm_device_t *dev, OUT_RING( (start<<5) | 1 ); ADVANCE_LP_RING(); #else - /* 845 ONLY: */ + /* 845 ONLY, and subject to some lockups: */ BEGIN_LP_RING(2); OUT_RING( MI_VERTEX_BUFFER ); OUT_RING( start ); @@ -1603,6 +1603,12 @@ int i830_setparam( DRM_IOCTL_ARGS ) case I830_SETPARAM_USE_MI_BATCHBUFFER_START: dev_priv->use_mi_batchbuffer_start = param.value; break; + case I830_SETPARAM_TEX_LRU_LOG_GRANULARITY: + dev_priv->tex_lru_log_granularity = param.value; + break; + case I830_SETPARAM_TEX_LRU_NR_REGIONS: + dev_priv->tex_lru_nr_regions = param.value; + break; default: return DRM_ERR(EINVAL); } diff --git a/linux/i830_drm.h b/linux/i830_drm.h index 2e09c53e..28e02e89 100644 --- a/linux/i830_drm.h +++ b/linux/i830_drm.h @@ -267,6 +267,9 @@ typedef struct _drm_i830_sarea { #define DRM_IOCTL_I830_SETPARAM DRM_IOWR(0x4d, drm_i830_setparam_t) #define DRM_IOCTL_I830_GETBUF2 DRM_IOWR(0x4e, drm_i830_dma_t) #define DRM_IOCTL_I830_VERTEX2 DRM_IOW( 0x4f, drm_i830_vertex_t) +#define DRM_IOCTL_I830_ALLOC DRM_IOWR(0x50, drm_i830_mem_alloc_t) +#define DRM_IOCTL_I830_FREE DRM_IOW( 0x51, drm_i830_mem_free_t) +#define DRM_IOCTL_I830_INIT_HEAP DRM_IOW( 0x52, drm_i830_mem_init_heap_t) typedef struct _drm_i830_clear { int clear_color; @@ -327,11 +330,36 @@ typedef struct drm_i830_getparam { /* 1.3: New ioctl to set kernel params: */ #define I830_SETPARAM_USE_MI_BATCHBUFFER_START 1 +#define I830_SETPARAM_PERF_BOXES 2 +#define I830_SETPARAM_TEX_LRU_LOG_GRANULARITY 3 +#define I830_SETPARAM_TEX_LRU_NR_REGIONS 4 typedef struct drm_i830_setparam { int param; int value; } drm_i830_setparam_t; +/* 1.4: Set up a memory manager for regions of shared memory: + */ +#define I830_MEM_REGION_AGP 1 + +typedef struct drm_i830_mem_alloc { + int region; + int alignment; + int size; + int *region_offset; /* offset from start of fb or agp */ +} drm_i830_mem_alloc_t; + +typedef struct drm_i830_mem_free { + int region; + int region_offset; +} drm_i830_mem_free_t; + +typedef struct drm_i830_mem_init_heap { + int region; + int size; + int start; +} drm_i830_mem_init_heap_t; + #endif /* _I830_DRM_H_ */ diff --git a/linux/i830_drv.h b/linux/i830_drv.h index 9ba912fd..0849871e 100644 --- a/linux/i830_drv.h +++ b/linux/i830_drv.h @@ -51,6 +51,14 @@ typedef struct _drm_i830_ring_buffer{ int space; } drm_i830_ring_buffer_t; +struct mem_block { + struct mem_block *next; + struct mem_block *prev; + int start; + int size; + DRMFILE filp; /* 0: free, -1: heap, other: real files */ +}; + typedef struct drm_i830_private { drm_map_t *sarea_map; drm_map_t *buffer_map; @@ -88,63 +96,50 @@ typedef struct drm_i830_private { atomic_t irq_emitted; int use_mi_batchbuffer_start; + int tex_lru_log_granularity; + int tex_lru_nr_regions; + + struct mem_block *agp_heap; } drm_i830_private_t; /* i830_dma.c */ extern int i830_dma_schedule(drm_device_t *dev, int locked); -extern int i830_getbuf(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern int i830_getbuf2(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern int i830_dma_init(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int i830_dma_cleanup(drm_device_t *dev); -extern int i830_flush_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern void i830_reclaim_buffers(struct file *filp); -extern int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd, - unsigned long arg); -extern int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma); -extern int i830_copybuf(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); -extern int i830_docopy(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - extern void i830_dma_quiescent(drm_device_t *dev); - -extern int i830_dma_vertex(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_dma_vertex2(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_swap_bufs(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_clear_bufs(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_flip_bufs(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); - -extern int i830_getparam( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); - -extern int i830_setparam( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); +extern void i830_reclaim_buffers( DRMFILE filp); + +extern int i830_getbuf( DRM_IOCTL_ARGS ); +extern int i830_getbuf2( DRM_IOCTL_ARGS ); +extern int i830_dma_init( DRM_IOCTL_ARGS ); +extern int i830_flush_ioctl( DRM_IOCTL_ARGS ); +extern int i830_getage( DRM_IOCTL_ARGS ); +extern int i830_copybuf( DRM_IOCTL_ARGS ); +extern int i830_docopy( DRM_IOCTL_ARGS ); +extern int i830_dma_vertex( DRM_IOCTL_ARGS ); +extern int i830_dma_vertex2( DRM_IOCTL_ARGS ); +extern int i830_swap_bufs( DRM_IOCTL_ARGS ); +extern int i830_clear_bufs( DRM_IOCTL_ARGS ); +extern int i830_flip_bufs( DRM_IOCTL_ARGS ); +extern int i830_getparam( DRM_IOCTL_ARGS ); +extern int i830_setparam( DRM_IOCTL_ARGS ); /* i830_irq.c */ -extern int i830_irq_emit( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); -extern int i830_irq_wait( struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg ); +extern int i830_irq_emit( DRM_IOCTL_ARGS ); +extern int i830_irq_wait( DRM_IOCTL_ARGS ); extern int i830_wait_irq(drm_device_t *dev, int irq_nr); extern int i830_emit_irq(drm_device_t *dev); -#define I830_BASE(reg) ((unsigned long) \ - dev_priv->mmio_map->handle) +/* i830_mem.c */ +extern int i830_mem_alloc( DRM_IOCTL_ARGS ); +extern int i830_mem_free( DRM_IOCTL_ARGS ); +extern int i830_mem_init_heap( DRM_IOCTL_ARGS ); +extern void i830_mem_takedown( struct mem_block **heap ); +extern void i830_mem_release( drm_device_t *dev, + DRMFILE filp, struct mem_block *heap ); + +#define I830_BASE(reg) ((unsigned long) dev_priv->mmio_map->handle) #define I830_ADDR(reg) (I830_BASE(reg) + reg) #define I830_DEREF(reg) *(__volatile__ unsigned int *)I830_ADDR(reg) #define I830_READ(reg) readl((volatile u32 *)I830_ADDR(reg)) @@ -162,7 +157,7 @@ extern int i830_emit_irq(drm_device_t *dev); #define BEGIN_LP_RING(n) do { \ if (I830_VERBOSE) \ - printk("BEGIN_LP_RING(%d) in %s\n", \ + DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \ n, __FUNCTION__); \ if (dev_priv->ring.space < n*4) \ i830_wait_ring(dev, n*4, __FUNCTION__); \ @@ -174,7 +169,7 @@ extern int i830_emit_irq(drm_device_t *dev); #define OUT_RING(n) do { \ - if (I830_VERBOSE) printk(" OUT_RING %x\n", (int)(n)); \ + if (I830_VERBOSE) DRM_DEBUG(" OUT_RING %x\n", (int)(n)); \ *(volatile unsigned int *)(virt + outring) = n; \ outcount++; \ outring += 4; \ @@ -182,7 +177,7 @@ extern int i830_emit_irq(drm_device_t *dev); } while (0) #define ADVANCE_LP_RING() do { \ - if (I830_VERBOSE) printk("ADVANCE_LP_RING %x\n", outring); \ + if (I830_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING %x\n", outring); \ dev_priv->ring.tail = outring; \ dev_priv->ring.space -= outcount * 4; \ I830_WRITE(LP_RING + RING_TAIL, outring); \ diff --git a/linux/i830_mem.c b/linux/i830_mem.c new file mode 100644 index 00000000..970d763b --- /dev/null +++ b/linux/i830_mem.c @@ -0,0 +1,382 @@ +/* i830_mem.c -- Simple agp/fb memory manager for i830 -*- linux-c -*- + * + * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. + * + * The Weather Channel (TM) funded Tungsten Graphics to develop the + * initial release of the I830 8500 driver under the XFree86 license. + * This notice must be preserved. + * + * 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: + * Keith Whitwell + */ + +#include "i830.h" +#include "drmP.h" +#include "drm.h" +#include "i830_drm.h" +#include "i830_drv.h" + +/* This memory manager is integrated into the global/local lru + * mechanisms used by the clients. Specifically, it operates by + * setting the 'in_use' fields of the global LRU to indicate whether + * this region is privately allocated to a client. + * + * This does require the client to actually respect that field. + * + * Currently no effort is made to allocate 'private' memory in any + * clever way - the LRU information isn't used to determine which + * block to allocate, and the ring is drained prior to allocations -- + * in other words allocation is expensive. + */ +static void mark_block( drm_device_t *dev, struct mem_block *p, + int in_use ) +{ + drm_i830_private_t *dev_priv = dev->dev_private; + drm_i830_sarea_t *sarea_priv = dev_priv->sarea_priv; + drm_i830_tex_region_t *list; + unsigned shift, nr; + unsigned start; + unsigned end; + unsigned i; + int age; + + shift = dev_priv->tex_lru_log_granularity; + nr = dev_priv->tex_lru_nr_regions; + + start = p->start >> shift; + end = (p->start + p->size - 1) >> shift; + + age = ++sarea_priv->texAge; + list = sarea_priv->texList; + + /* Mark the regions with the new flag and update their age. Move + * them to head of list to preserve LRU semantics. + */ + for (i = start ; i <= end ; i++) { + list[i].in_use = in_use; + list[i].age = age; + + /* remove_from_list(i) + */ + list[(unsigned)list[i].next].prev = list[i].prev; + list[(unsigned)list[i].prev].next = list[i].next; + + /* insert_at_head(list, i) + */ + list[i].prev = nr; + list[i].next = list[nr].next; + list[(unsigned)list[nr].next].prev = i; + list[nr].next = i; + } +} + + +/* Very simple allocator for agp memory, working on a static range + * already mapped into each client's address space. + */ + +static struct mem_block *split_block(struct mem_block *p, int start, int size, + DRMFILE filp ) +{ + /* Maybe cut off the start of an existing block */ + if (start > p->start) { + struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock)); + if (!newblock) + goto out; + newblock->start = start; + newblock->size = p->size - (start - p->start); + newblock->filp = 0; + newblock->next = p->next; + newblock->prev = p; + p->next->prev = newblock; + p->next = newblock; + p->size -= newblock->size; + p = newblock; + } + + /* Maybe cut off the end of an existing block */ + if (size < p->size) { + struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock)); + if (!newblock) + goto out; + newblock->start = start + size; + newblock->size = p->size - size; + newblock->filp = 0; + newblock->next = p->next; + newblock->prev = p; + p->next->prev = newblock; + p->next = newblock; + p->size = size; + } + + out: + /* Our block is in the middle */ + p->filp = filp; + return p; +} + +static struct mem_block *alloc_block( struct mem_block *heap, int size, + int align2, DRMFILE filp ) +{ + struct mem_block *p; + int mask = (1 << align2)-1; + + for (p = heap->next ; p != heap ; p = p->next) { + int start = (p->start + mask) & ~mask; + if (p->filp == 0 && start + size <= p->start + p->size) + return split_block( p, start, size, filp ); + } + + return NULL; +} + +static struct mem_block *find_block( struct mem_block *heap, int start ) +{ + struct mem_block *p; + + for (p = heap->next ; p != heap ; p = p->next) + if (p->start == start) + return p; + + return NULL; +} + + +static void free_block( struct mem_block *p ) +{ + p->filp = 0; + + /* Assumes a single contiguous range. Needs a special filp in + * 'heap' to stop it being subsumed. + */ + if (p->next->filp == 0) { + struct mem_block *q = p->next; + p->size += q->size; + p->next = q->next; + p->next->prev = p; + DRM_FREE(q, sizeof(*q)); + } + + if (p->prev->filp == 0) { + struct mem_block *q = p->prev; + q->size += p->size; + q->next = p->next; + q->next->prev = q; + DRM_FREE(p, sizeof(*q)); + } +} + +/* Initialize. How to check for an uninitialized heap? + */ +static int init_heap(struct mem_block **heap, int start, int size) +{ + struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks)); + + if (!blocks) + return -ENOMEM; + + *heap = DRM_MALLOC(sizeof(**heap)); + if (!*heap) { + DRM_FREE( blocks, sizeof(*blocks) ); + return -ENOMEM; + } + + blocks->start = start; + blocks->size = size; + blocks->filp = 0; + blocks->next = blocks->prev = *heap; + + memset( *heap, 0, sizeof(**heap) ); + (*heap)->filp = (DRMFILE) -1; + (*heap)->next = (*heap)->prev = blocks; + return 0; +} + + +/* Free all blocks associated with the releasing file. + */ +void i830_mem_release( drm_device_t *dev, + DRMFILE filp, struct mem_block *heap ) +{ + struct mem_block *p; + + if (!heap || !heap->next) + return; + + for (p = heap->next ; p != heap ; p = p->next) { + if (p->filp == filp) { + p->filp = 0; + mark_block( dev, p, 0 ); + } + } + + /* Assumes a single contiguous range. Needs a special filp in + * 'heap' to stop it being subsumed. + */ + for (p = heap->next ; p != heap ; p = p->next) { + while (p->filp == 0 && p->next->filp == 0) { + struct mem_block *q = p->next; + p->size += q->size; + p->next = q->next; + p->next->prev = p; + DRM_FREE(q, sizeof(*q)); + } + } +} + +/* Shutdown. + */ +void i830_mem_takedown( struct mem_block **heap ) +{ + struct mem_block *p; + + if (!*heap) + return; + + for (p = (*heap)->next ; p != *heap ; ) { + struct mem_block *q = p; + p = p->next; + DRM_FREE(q, sizeof(*q)); + } + + DRM_FREE( *heap, sizeof(**heap) ); + *heap = 0; +} + + + +/* IOCTL HANDLERS */ + +static struct mem_block **get_heap( drm_i830_private_t *dev_priv, + int region ) +{ + switch( region ) { + case I830_MEM_REGION_AGP: + return &dev_priv->agp_heap; + default: + return 0; + } +} + +int i830_mem_alloc( DRM_IOCTL_ARGS ) +{ + DRM_DEVICE; + drm_i830_private_t *dev_priv = dev->dev_private; + drm_i830_mem_alloc_t alloc; + struct mem_block *block, **heap; + + if ( !dev_priv ) { + DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ ); + return DRM_ERR(EINVAL); + } + + DRM_COPY_FROM_USER_IOCTL( alloc, (drm_i830_mem_alloc_t *)data, + sizeof(alloc) ); + + heap = get_heap( dev_priv, alloc.region ); + if (!heap || !*heap) + return DRM_ERR(EFAULT); + + /* Make things easier on ourselves: all allocations at least + * 4k aligned. + */ + if (alloc.alignment < 12) + alloc.alignment = 12; + + block = alloc_block( *heap, alloc.size, alloc.alignment, + filp ); + + if (!block) + return DRM_ERR(ENOMEM); + + mark_block( dev, block, 1 ); + + if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start, + sizeof(int) ) ) { + DRM_ERROR( "copy_to_user\n" ); + return DRM_ERR(EFAULT); + } + + return 0; +} + + + +int i830_mem_free( DRM_IOCTL_ARGS ) +{ + DRM_DEVICE; + drm_i830_private_t *dev_priv = dev->dev_private; + drm_i830_mem_free_t memfree; + struct mem_block *block, **heap; + + if ( !dev_priv ) { + DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ ); + return DRM_ERR(EINVAL); + } + + DRM_COPY_FROM_USER_IOCTL( memfree, (drm_i830_mem_free_t *)data, + sizeof(memfree) ); + + heap = get_heap( dev_priv, memfree.region ); + if (!heap || !*heap) + return DRM_ERR(EFAULT); + + block = find_block( *heap, memfree.region_offset ); + if (!block) + return DRM_ERR(EFAULT); + + if (block->filp != filp) + return DRM_ERR(EPERM); + + mark_block( dev, block, 0 ); + free_block( block ); + return 0; +} + +int i830_mem_init_heap( DRM_IOCTL_ARGS ) +{ + DRM_DEVICE; + drm_i830_private_t *dev_priv = dev->dev_private; + drm_i830_mem_init_heap_t initheap; + struct mem_block **heap; + + if ( !dev_priv ) { + DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ ); + return DRM_ERR(EINVAL); + } + + DRM_COPY_FROM_USER_IOCTL( initheap, (drm_i830_mem_init_heap_t *)data, + sizeof(initheap) ); + + heap = get_heap( dev_priv, initheap.region ); + if (!heap) + return DRM_ERR(EFAULT); + + if (*heap) { + DRM_ERROR("heap already initialized?"); + return DRM_ERR(EFAULT); + } + + return init_heap( heap, initheap.start, initheap.size ); +} + + -- cgit v1.2.3