fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-05 13:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

irq, allocator bugfixes

Browse source
This commit is contained in:
Keith Whitwell 2002-09-17 11:27:29 +00:00
parent af2412cda1
commit 52ca47accb
7 changed files with 86 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shared-core/radeon_irq.c
View file

@ -129,7 +129,7 @@ int radeon_wait_irq(drm_device_t *dev, int irq_nr)
if (atomic_read(&dev_priv->irq_received) >= irq_nr)
break;
if((signed)(end - jiffies) <= 0) {
ret = -EBUSY; /* ? */
ret = -EBUSY; /* Lockup? Missed irq? */
break;
}
schedule_timeout(HZ*3);

46
shared-core/radeon_mem.c
View file

@ -132,6 +132,16 @@ static void free_block( struct mem_block *p )
}
}
static void print_heap( struct mem_block *heap )
{
struct mem_block *p;
for (p = heap->next ; p != heap ; p = p->next)
printk("0x%x..0x%x (0x%x) -- owner %d\n",
p->start, p->start + p->size,
p->size, p->pid);
}
/* Initialize. How to check for an uninitialized heap?
*/
static int init_heap(struct mem_block **heap, int start, int size)
@ -166,11 +176,19 @@ void radeon_mem_release( struct mem_block *heap )
int pid = DRM_CURRENTPID;
struct mem_block *p;
printk("%s\n", __FUNCTION__);
for (p = heap->next ; p != heap ; p = p->next) {
if (p->pid == pid)
if (p->pid == pid) {
printk("%s free 0x%x owner %d\n", __FUNCTION__,
p->start, p->pid);
p->pid = 0;
}
}
printk("%s stage 1:\n", __FUNCTION__);
print_heap(heap);
/* Assumes a single contiguous range. Needs a special pid in
* 'heap' to stop it being subsumed.
*/
@ -183,6 +201,9 @@ void radeon_mem_release( struct mem_block *heap )
kfree(q);
}
}
printk("%s stage 2:\n", __FUNCTION__);
print_heap(heap);
}
/* Shutdown.
@ -210,9 +231,9 @@ static struct mem_block **get_heap( drm_radeon_private_t *dev_priv,
{
switch( region ) {
case RADEON_MEM_REGION_AGP:
return &dev_priv->fb_heap;
return &dev_priv->agp_heap;
case RADEON_MEM_REGION_FB:
return &dev_priv->agp_heap;
return &dev_priv->fb_heap;
default:
return 0;
}
@ -225,8 +246,10 @@ int radeon_mem_alloc( DRM_IOCTL_ARGS )
drm_radeon_mem_alloc_t alloc;
struct mem_block *block, **heap;
printk("%s\n", __FUNCTION__);
if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __func__ );
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
return DRM_ERR(EINVAL);
}
@ -245,6 +268,13 @@ int radeon_mem_alloc( DRM_IOCTL_ARGS )
block = alloc_block( *heap, alloc.size, alloc.alignment,
DRM_CURRENTPID );
if (!block)
return DRM_ERR(ENOMEM);
printk("%s start 0x%x size 0x%x\n", __FUNCTION__,
block->start, block->size);
print_heap(*heap);
if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start,
sizeof(int) ) ) {
@ -264,8 +294,10 @@ int radeon_mem_free( DRM_IOCTL_ARGS )
drm_radeon_mem_free_t memfree;
struct mem_block *block, **heap;
printk("%s\n", __FUNCTION__);
if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __func__ );
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
return DRM_ERR(EINVAL);
}
@ -294,8 +326,10 @@ int radeon_mem_init_heap( DRM_IOCTL_ARGS )
drm_radeon_mem_init_heap_t initheap;
struct mem_block **heap;
printk("%s\n", __FUNCTION__);
if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __func__ );
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
return DRM_ERR(EINVAL);
}

1
shared-core/radeon_state.c
View file

@ -1225,6 +1225,7 @@ static int radeon_cp_dispatch_texture( drm_device_t *dev,
return ret;
}
static void radeon_cp_dispatch_stipple( drm_device_t *dev, u32 *stipple )
{
drm_radeon_private_t *dev_priv = dev->dev_private;

3
shared/radeon.h
View file

@ -104,7 +104,8 @@
*
* DRM infrastructure takes care of reclaiming dma buffers.
*/
#define DRIVER_RELEASE() do { \
#define DRIVER_PRERELEASE() do { \
printk("%s\n", __FUNCTION__); \
if ( dev->dev_private ) { \
drm_radeon_private_t *dev_priv = dev->dev_private; \
if ( dev_priv->page_flipping ) { \

2
shared/radeon_irq.c
View file

@ -129,7 +129,7 @@ int radeon_wait_irq(drm_device_t *dev, int irq_nr)
if (atomic_read(&dev_priv->irq_received) >= irq_nr)
break;
if((signed)(end - jiffies) <= 0) {
ret = -EBUSY; /* ? */
ret = -EBUSY; /* Lockup? Missed irq? */
break;
}
schedule_timeout(HZ*3);

46
shared/radeon_mem.c
View file

@ -132,6 +132,16 @@ static void free_block( struct mem_block *p )
}
}
static void print_heap( struct mem_block *heap )
{
struct mem_block *p;
for (p = heap->next ; p != heap ; p = p->next)
printk("0x%x..0x%x (0x%x) -- owner %d\n",
p->start, p->start + p->size,
p->size, p->pid);
}
/* Initialize. How to check for an uninitialized heap?
*/
static int init_heap(struct mem_block **heap, int start, int size)
@ -166,11 +176,19 @@ void radeon_mem_release( struct mem_block *heap )
int pid = DRM_CURRENTPID;
struct mem_block *p;
printk("%s\n", __FUNCTION__);
for (p = heap->next ; p != heap ; p = p->next) {
if (p->pid == pid)
if (p->pid == pid) {
printk("%s free 0x%x owner %d\n", __FUNCTION__,
p->start, p->pid);
p->pid = 0;
}
}
printk("%s stage 1:\n", __FUNCTION__);
print_heap(heap);
/* Assumes a single contiguous range. Needs a special pid in
* 'heap' to stop it being subsumed.
*/
@ -183,6 +201,9 @@ void radeon_mem_release( struct mem_block *heap )
kfree(q);
}
}
printk("%s stage 2:\n", __FUNCTION__);
print_heap(heap);
}
/* Shutdown.
@ -210,9 +231,9 @@ static struct mem_block **get_heap( drm_radeon_private_t *dev_priv,
{
switch( region ) {
case RADEON_MEM_REGION_AGP:
return &dev_priv->fb_heap;
return &dev_priv->agp_heap;
case RADEON_MEM_REGION_FB:
return &dev_priv->agp_heap;
return &dev_priv->fb_heap;
default:
return 0;
}
@ -225,8 +246,10 @@ int radeon_mem_alloc( DRM_IOCTL_ARGS )
drm_radeon_mem_alloc_t alloc;
struct mem_block *block, **heap;
printk("%s\n", __FUNCTION__);
if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __func__ );
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
return DRM_ERR(EINVAL);
}
@ -245,6 +268,13 @@ int radeon_mem_alloc( DRM_IOCTL_ARGS )
block = alloc_block( *heap, alloc.size, alloc.alignment,
DRM_CURRENTPID );
if (!block)
return DRM_ERR(ENOMEM);
printk("%s start 0x%x size 0x%x\n", __FUNCTION__,
block->start, block->size);
print_heap(*heap);
if ( DRM_COPY_TO_USER( alloc.region_offset, &block->start,
sizeof(int) ) ) {
@ -264,8 +294,10 @@ int radeon_mem_free( DRM_IOCTL_ARGS )
drm_radeon_mem_free_t memfree;
struct mem_block *block, **heap;
printk("%s\n", __FUNCTION__);
if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __func__ );
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
return DRM_ERR(EINVAL);
}
@ -294,8 +326,10 @@ int radeon_mem_init_heap( DRM_IOCTL_ARGS )
drm_radeon_mem_init_heap_t initheap;
struct mem_block **heap;
printk("%s\n", __FUNCTION__);
if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __func__ );
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
return DRM_ERR(EINVAL);
}

1
shared/radeon_state.c
View file

@ -1225,6 +1225,7 @@ static int radeon_cp_dispatch_texture( drm_device_t *dev,
return ret;
}
static void radeon_cp_dispatch_stipple( drm_device_t *dev, u32 *stipple )
{
drm_radeon_private_t *dev_priv = dev->dev_private;