fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 21:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes from kernel for 0 vs NULL - mika

Browse source
This commit is contained in:
Dave Airlie 2004-07-05 11:56:51 +00:00
parent 4cfd0d5cee
commit 3c9fb37e65
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux-core/drm_dma.c
View file

@ -153,7 +153,7 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
buf->waiting = 0; buf->waiting = 0;
buf->pending = 0; buf->pending = 0;
buf->filp = 0; buf->filp = NULL;
buf->used = 0; buf->used = 0;
if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) { if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {

4
linux-core/drm_lock.c
View file

@ -96,7 +96,7 @@ int DRM(lock_transfer)(drm_device_t *dev,
{ {
unsigned int old, new, prev; unsigned int old, new, prev;
dev->lock.filp = 0; dev->lock.filp = NULL;
do { do {
old = *lock; old = *lock;
new = context | _DRM_LOCK_HELD; new = context | _DRM_LOCK_HELD;
@ -121,7 +121,7 @@ int DRM(lock_free)(drm_device_t *dev,
{ {
unsigned int old, new, prev; unsigned int old, new, prev;
dev->lock.filp = 0; dev->lock.filp = NULL;
do { do {
old = *lock; old = *lock;
new = 0; new = 0;

4
linux-core/i830_dma.c
View file

@ -178,7 +178,7 @@ static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
/* Real error */ /* Real error */
DRM_ERROR("mmap error\n"); DRM_ERROR("mmap error\n");
retcode = PTR_ERR(buf_priv->virtual); retcode = PTR_ERR(buf_priv->virtual);
buf_priv->virtual = 0; buf_priv->virtual = NULL;
} }
up_write( &current->mm->mmap_sem ); up_write( &current->mm->mmap_sem );
@ -200,7 +200,7 @@ static int i830_unmap_buffer(drm_buf_t *buf)
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
buf_priv->currently_mapped = I830_BUF_UNMAPPED; buf_priv->currently_mapped = I830_BUF_UNMAPPED;
buf_priv->virtual = 0; buf_priv->virtual = NULL;
return retcode; return retcode;
} }

2
linux/drm_dma.h
View file

@ -153,7 +153,7 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
buf->waiting = 0; buf->waiting = 0;
buf->pending = 0; buf->pending = 0;
buf->filp = 0; buf->filp = NULL;
buf->used = 0; buf->used = 0;
if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) { if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {

4
linux/drm_lock.h
View file

@ -96,7 +96,7 @@ int DRM(lock_transfer)(drm_device_t *dev,
{ {
unsigned int old, new, prev; unsigned int old, new, prev;
dev->lock.filp = 0; dev->lock.filp = NULL;
do { do {
old = *lock; old = *lock;
new = context | _DRM_LOCK_HELD; new = context | _DRM_LOCK_HELD;
@ -121,7 +121,7 @@ int DRM(lock_free)(drm_device_t *dev,
{ {
unsigned int old, new, prev; unsigned int old, new, prev;
dev->lock.filp = 0; dev->lock.filp = NULL;
do { do {
old = *lock; old = *lock;
new = 0; new = 0;

4
linux/i830_dma.c
View file

@ -178,7 +178,7 @@ static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
/* Real error */ /* Real error */
DRM_ERROR("mmap error\n"); DRM_ERROR("mmap error\n");
retcode = PTR_ERR(buf_priv->virtual); retcode = PTR_ERR(buf_priv->virtual);
buf_priv->virtual = 0; buf_priv->virtual = NULL;
} }
up_write( &current->mm->mmap_sem ); up_write( &current->mm->mmap_sem );
@ -200,7 +200,7 @@ static int i830_unmap_buffer(drm_buf_t *buf)
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
buf_priv->currently_mapped = I830_BUF_UNMAPPED; buf_priv->currently_mapped = I830_BUF_UNMAPPED;
buf_priv->virtual = 0; buf_priv->virtual = NULL;
return retcode; return retcode;
} }