DRM_FREE/2 patch from Philip Brown
parent
708ecd0e4b
commit
51e5f73d2a
|
@ -692,7 +692,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev )
|
|||
psignal(p, vbl_sig->signo);
|
||||
|
||||
TAILQ_REMOVE(&dev->vbl_sig_list, vbl_sig, link);
|
||||
DRM_FREE(vbl_sig);
|
||||
DRM_FREE(vbl_sig,sizeof(*vbl_sig));
|
||||
}
|
||||
vbl_sig = next;
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@
|
|||
#define DRM_IRQ_ARGS void *arg
|
||||
#define DRM_DEVICE drm_device_t *dev = kdev->si_drv1
|
||||
#define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT )
|
||||
#define DRM_FREE(pt) free( pt, DRM(M_DRM) )
|
||||
#define DRM_FREE(pt,size) free( pt, DRM(M_DRM) )
|
||||
#define DRM_VTOPHYS(addr) vtophys(addr)
|
||||
|
||||
/* Read/write from bus space, with byteswapping to le if necessary */
|
||||
|
|
|
@ -89,7 +89,7 @@ MALLOC_DECLARE(DRM(M_DRM));
|
|||
extern const int DRM(M_DRM) = M_DEVBUF;
|
||||
#endif /* __NetBSD_Version__ */
|
||||
#define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT )
|
||||
#define DRM_FREE(pt) free( pt, DRM(M_DRM) )
|
||||
#define DRM_FREE(pt,size) free( pt, DRM(M_DRM) )
|
||||
#define DRM_VTOPHYS(addr) vtophys(addr)
|
||||
|
||||
#define DRM_READ8(map, offset) bus_space_read_1( (map)->iot, (map)->ioh, (offset) )
|
||||
|
|
|
@ -692,7 +692,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev )
|
|||
psignal(p, vbl_sig->signo);
|
||||
|
||||
TAILQ_REMOVE(&dev->vbl_sig_list, vbl_sig, link);
|
||||
DRM_FREE(vbl_sig);
|
||||
DRM_FREE(vbl_sig,sizeof(*vbl_sig));
|
||||
}
|
||||
vbl_sig = next;
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@
|
|||
#define DRM_IRQ_ARGS void *arg
|
||||
#define DRM_DEVICE drm_device_t *dev = kdev->si_drv1
|
||||
#define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT )
|
||||
#define DRM_FREE(pt) free( pt, DRM(M_DRM) )
|
||||
#define DRM_FREE(pt,size) free( pt, DRM(M_DRM) )
|
||||
#define DRM_VTOPHYS(addr) vtophys(addr)
|
||||
|
||||
/* Read/write from bus space, with byteswapping to le if necessary */
|
||||
|
|
|
@ -89,7 +89,7 @@ MALLOC_DECLARE(DRM(M_DRM));
|
|||
extern const int DRM(M_DRM) = M_DEVBUF;
|
||||
#endif /* __NetBSD_Version__ */
|
||||
#define DRM_MALLOC(size) malloc( size, DRM(M_DRM), M_NOWAIT )
|
||||
#define DRM_FREE(pt) free( pt, DRM(M_DRM) )
|
||||
#define DRM_FREE(pt,size) free( pt, DRM(M_DRM) )
|
||||
#define DRM_VTOPHYS(addr) vtophys(addr)
|
||||
|
||||
#define DRM_READ8(map, offset) bus_space_read_1( (map)->iot, (map)->ioh, (offset) )
|
||||
|
|
|
@ -714,7 +714,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev )
|
|||
|
||||
list_del( (struct list_head *) vbl_sig );
|
||||
|
||||
DRM_FREE( vbl_sig );
|
||||
DRM_FREE(vbl_sig,sizeof(*vbl_sig));
|
||||
|
||||
dev->vbl_pending--;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
/* malloc/free without the overhead of DRM(alloc) */
|
||||
#define DRM_MALLOC(x) kmalloc(x, GFP_KERNEL)
|
||||
#define DRM_FREE(x) kfree(x)
|
||||
#define DRM_FREE(x,size) kfree(x)
|
||||
|
||||
#define DRM_GETSAREA() \
|
||||
do { \
|
||||
|
|
|
@ -714,7 +714,7 @@ void DRM(vbl_send_signals)( drm_device_t *dev )
|
|||
|
||||
list_del( (struct list_head *) vbl_sig );
|
||||
|
||||
DRM_FREE( vbl_sig );
|
||||
DRM_FREE(vbl_sig,sizeof(*vbl_sig));
|
||||
|
||||
dev->vbl_pending--;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
|
||||
/* malloc/free without the overhead of DRM(alloc) */
|
||||
#define DRM_MALLOC(x) kmalloc(x, GFP_KERNEL)
|
||||
#define DRM_FREE(x) kfree(x)
|
||||
#define DRM_FREE(x,size) kfree(x)
|
||||
|
||||
#define DRM_GETSAREA() \
|
||||
do { \
|
||||
|
|
|
@ -896,7 +896,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
int count, x, y;
|
||||
u32 *buffer;
|
||||
u8 *mask;
|
||||
int i;
|
||||
int i, buffer_size, mask_size;
|
||||
RING_LOCALS;
|
||||
DRM_DEBUG( "\n" );
|
||||
|
||||
|
@ -908,25 +908,25 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
buffer = DRM_MALLOC( depth->n * sizeof(u32) );
|
||||
buffer_size = depth->n * sizeof(u32);
|
||||
buffer = DRM_MALLOC( buffer_size );
|
||||
if ( buffer == NULL )
|
||||
return DRM_ERR(ENOMEM);
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer,
|
||||
depth->n * sizeof(u32) ) ) {
|
||||
DRM_FREE( buffer );
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer, buffer_size ) ) {
|
||||
DRM_FREE( buffer, buffer_size);
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
mask_size = depth->n * sizeof(u8);
|
||||
if ( depth->mask ) {
|
||||
mask = DRM_MALLOC( depth->n * sizeof(u8) );
|
||||
mask = DRM_MALLOC( mask_size );
|
||||
if ( mask == NULL ) {
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask,
|
||||
depth->n * sizeof(u8) ) ) {
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( mask );
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask, mask_size ) ) {
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
DRM_FREE( mask, mask_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
@ -953,7 +953,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( mask );
|
||||
DRM_FREE( mask, mask_size );
|
||||
} else {
|
||||
for ( i = 0 ; i < count ; i++, x++ ) {
|
||||
BEGIN_RING( 6 );
|
||||
|
@ -977,7 +977,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -989,60 +989,62 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
|
|||
int count, *x, *y;
|
||||
u32 *buffer;
|
||||
u8 *mask;
|
||||
int i;
|
||||
int i, xbuf_size, ybuf_size, buffer_size, mask_size;
|
||||
RING_LOCALS;
|
||||
DRM_DEBUG( "\n" );
|
||||
|
||||
count = depth->n;
|
||||
|
||||
x = DRM_MALLOC( count * sizeof(*x) );
|
||||
xbuf_size = count * sizeof(*x);
|
||||
ybuf_size = count * sizeof(*y);
|
||||
x = DRM_MALLOC( xbuf_size );
|
||||
if ( x == NULL ) {
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
y = DRM_MALLOC( count * sizeof(*y) );
|
||||
y = DRM_MALLOC( ybuf_size );
|
||||
if ( y == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, xbuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, xbuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
buffer = DRM_MALLOC( depth->n * sizeof(u32) );
|
||||
buffer_size = depth->n * sizeof(u32);
|
||||
buffer = DRM_MALLOC( buffer_size );
|
||||
if ( buffer == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer,
|
||||
depth->n * sizeof(u32) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer, buffer_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
if ( depth->mask ) {
|
||||
mask = DRM_MALLOC( depth->n * sizeof(u8) );
|
||||
mask_size = depth->n * sizeof(u8);
|
||||
mask = DRM_MALLOC( mask_size );
|
||||
if ( mask == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask,
|
||||
depth->n * sizeof(u8) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( mask );
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask, mask_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
DRM_FREE( mask, mask_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
@ -1069,7 +1071,7 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( mask );
|
||||
DRM_FREE( mask, mask_size );
|
||||
} else {
|
||||
for ( i = 0 ; i < count ; i++ ) {
|
||||
BEGIN_RING( 6 );
|
||||
|
@ -1093,9 +1095,9 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1146,7 +1148,7 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
|
|||
{
|
||||
drm_r128_private_t *dev_priv = dev->dev_private;
|
||||
int count, *x, *y;
|
||||
int i;
|
||||
int i, xbuf_size, ybuf_size;
|
||||
RING_LOCALS;
|
||||
DRM_DEBUG( "%s\n", __FUNCTION__ );
|
||||
|
||||
|
@ -1155,23 +1157,25 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
|
|||
count = dev_priv->depth_pitch;
|
||||
}
|
||||
|
||||
x = DRM_MALLOC( count * sizeof(*x) );
|
||||
xbuf_size = count * sizeof(*x);
|
||||
ybuf_size = count * sizeof(*y);
|
||||
x = DRM_MALLOC( xbuf_size );
|
||||
if ( x == NULL ) {
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
y = DRM_MALLOC( count * sizeof(*y) );
|
||||
y = DRM_MALLOC( ybuf_size );
|
||||
if ( y == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, xbuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, ybuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
@ -1199,8 +1203,8 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
|
|||
ADVANCE_RING();
|
||||
}
|
||||
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -118,7 +118,7 @@ static void free_block( struct mem_block *p )
|
|||
p->size += q->size;
|
||||
p->next = q->next;
|
||||
p->next->prev = p;
|
||||
DRM_FREE(q);
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
|
||||
if (p->prev->pid == 0) {
|
||||
|
@ -126,7 +126,7 @@ static void free_block( struct mem_block *p )
|
|||
q->size += p->size;
|
||||
q->next = p->next;
|
||||
q->next->prev = q;
|
||||
DRM_FREE(p);
|
||||
DRM_FREE(p, sizeof(*q));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -141,7 +141,7 @@ static int init_heap(struct mem_block **heap, int start, int size)
|
|||
|
||||
*heap = DRM_MALLOC(sizeof(**heap));
|
||||
if (!*heap) {
|
||||
DRM_FREE( blocks );
|
||||
DRM_FREE( blocks, sizeof(*blocks) );
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
@ -181,7 +181,7 @@ void radeon_mem_release( struct mem_block *heap )
|
|||
p->size += q->size;
|
||||
p->next = q->next;
|
||||
p->next->prev = p;
|
||||
DRM_FREE(q);
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -198,10 +198,10 @@ void radeon_mem_takedown( struct mem_block **heap )
|
|||
for (p = (*heap)->next ; p != *heap ; ) {
|
||||
struct mem_block *q = p;
|
||||
p = p->next;
|
||||
DRM_FREE(q);
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
|
||||
DRM_FREE( *heap );
|
||||
DRM_FREE( *heap, sizeof(**heap) );
|
||||
*heap = 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -896,7 +896,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
int count, x, y;
|
||||
u32 *buffer;
|
||||
u8 *mask;
|
||||
int i;
|
||||
int i, buffer_size, mask_size;
|
||||
RING_LOCALS;
|
||||
DRM_DEBUG( "\n" );
|
||||
|
||||
|
@ -908,25 +908,25 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
buffer = DRM_MALLOC( depth->n * sizeof(u32) );
|
||||
buffer_size = depth->n * sizeof(u32);
|
||||
buffer = DRM_MALLOC( buffer_size );
|
||||
if ( buffer == NULL )
|
||||
return DRM_ERR(ENOMEM);
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer,
|
||||
depth->n * sizeof(u32) ) ) {
|
||||
DRM_FREE( buffer );
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer, buffer_size ) ) {
|
||||
DRM_FREE( buffer, buffer_size);
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
mask_size = depth->n * sizeof(u8);
|
||||
if ( depth->mask ) {
|
||||
mask = DRM_MALLOC( depth->n * sizeof(u8) );
|
||||
mask = DRM_MALLOC( mask_size );
|
||||
if ( mask == NULL ) {
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask,
|
||||
depth->n * sizeof(u8) ) ) {
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( mask );
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask, mask_size ) ) {
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
DRM_FREE( mask, mask_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
@ -953,7 +953,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( mask );
|
||||
DRM_FREE( mask, mask_size );
|
||||
} else {
|
||||
for ( i = 0 ; i < count ; i++, x++ ) {
|
||||
BEGIN_RING( 6 );
|
||||
|
@ -977,7 +977,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -989,60 +989,62 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
|
|||
int count, *x, *y;
|
||||
u32 *buffer;
|
||||
u8 *mask;
|
||||
int i;
|
||||
int i, xbuf_size, ybuf_size, buffer_size, mask_size;
|
||||
RING_LOCALS;
|
||||
DRM_DEBUG( "\n" );
|
||||
|
||||
count = depth->n;
|
||||
|
||||
x = DRM_MALLOC( count * sizeof(*x) );
|
||||
xbuf_size = count * sizeof(*x);
|
||||
ybuf_size = count * sizeof(*y);
|
||||
x = DRM_MALLOC( xbuf_size );
|
||||
if ( x == NULL ) {
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
y = DRM_MALLOC( count * sizeof(*y) );
|
||||
y = DRM_MALLOC( ybuf_size );
|
||||
if ( y == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, xbuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, xbuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
buffer = DRM_MALLOC( depth->n * sizeof(u32) );
|
||||
buffer_size = depth->n * sizeof(u32);
|
||||
buffer = DRM_MALLOC( buffer_size );
|
||||
if ( buffer == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer,
|
||||
depth->n * sizeof(u32) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
if ( DRM_COPY_FROM_USER( buffer, depth->buffer, buffer_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
if ( depth->mask ) {
|
||||
mask = DRM_MALLOC( depth->n * sizeof(u8) );
|
||||
mask_size = depth->n * sizeof(u8);
|
||||
mask = DRM_MALLOC( mask_size );
|
||||
if ( mask == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask,
|
||||
depth->n * sizeof(u8) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( mask );
|
||||
if ( DRM_COPY_FROM_USER( mask, depth->mask, mask_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
DRM_FREE( mask, mask_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
@ -1069,7 +1071,7 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( mask );
|
||||
DRM_FREE( mask, mask_size );
|
||||
} else {
|
||||
for ( i = 0 ; i < count ; i++ ) {
|
||||
BEGIN_RING( 6 );
|
||||
|
@ -1093,9 +1095,9 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
|
|||
}
|
||||
}
|
||||
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( buffer );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
DRM_FREE( buffer, buffer_size );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1146,7 +1148,7 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
|
|||
{
|
||||
drm_r128_private_t *dev_priv = dev->dev_private;
|
||||
int count, *x, *y;
|
||||
int i;
|
||||
int i, xbuf_size, ybuf_size;
|
||||
RING_LOCALS;
|
||||
DRM_DEBUG( "%s\n", __FUNCTION__ );
|
||||
|
||||
|
@ -1155,23 +1157,25 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
|
|||
count = dev_priv->depth_pitch;
|
||||
}
|
||||
|
||||
x = DRM_MALLOC( count * sizeof(*x) );
|
||||
xbuf_size = count * sizeof(*x);
|
||||
ybuf_size = count * sizeof(*y);
|
||||
x = DRM_MALLOC( xbuf_size );
|
||||
if ( x == NULL ) {
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
y = DRM_MALLOC( count * sizeof(*y) );
|
||||
y = DRM_MALLOC( ybuf_size );
|
||||
if ( y == NULL ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
return DRM_ERR(ENOMEM);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( x, depth->x, xbuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, count * sizeof(int) ) ) {
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
if ( DRM_COPY_FROM_USER( y, depth->y, ybuf_size ) ) {
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
return DRM_ERR(EFAULT);
|
||||
}
|
||||
|
||||
|
@ -1199,8 +1203,8 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
|
|||
ADVANCE_RING();
|
||||
}
|
||||
|
||||
DRM_FREE( x );
|
||||
DRM_FREE( y );
|
||||
DRM_FREE( x, xbuf_size );
|
||||
DRM_FREE( y, ybuf_size );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -118,7 +118,7 @@ static void free_block( struct mem_block *p )
|
|||
p->size += q->size;
|
||||
p->next = q->next;
|
||||
p->next->prev = p;
|
||||
DRM_FREE(q);
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
|
||||
if (p->prev->pid == 0) {
|
||||
|
@ -126,7 +126,7 @@ static void free_block( struct mem_block *p )
|
|||
q->size += p->size;
|
||||
q->next = p->next;
|
||||
q->next->prev = q;
|
||||
DRM_FREE(p);
|
||||
DRM_FREE(p, sizeof(*q));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -141,7 +141,7 @@ static int init_heap(struct mem_block **heap, int start, int size)
|
|||
|
||||
*heap = DRM_MALLOC(sizeof(**heap));
|
||||
if (!*heap) {
|
||||
DRM_FREE( blocks );
|
||||
DRM_FREE( blocks, sizeof(*blocks) );
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
@ -181,7 +181,7 @@ void radeon_mem_release( struct mem_block *heap )
|
|||
p->size += q->size;
|
||||
p->next = q->next;
|
||||
p->next->prev = p;
|
||||
DRM_FREE(q);
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -198,10 +198,10 @@ void radeon_mem_takedown( struct mem_block **heap )
|
|||
for (p = (*heap)->next ; p != *heap ; ) {
|
||||
struct mem_block *q = p;
|
||||
p = p->next;
|
||||
DRM_FREE(q);
|
||||
DRM_FREE(q, sizeof(*q));
|
||||
}
|
||||
|
||||
DRM_FREE( *heap );
|
||||
DRM_FREE( *heap, sizeof(**heap) );
|
||||
*heap = 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue