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

fix some return values

Browse source
This commit is contained in:
Alan Hourihane 2001-04-30 14:26:55 +00:00
parent 02892f28f4
commit f982e046e7
8 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux-core/drmP.h
View file

@ -74,7 +74,7 @@
/* Begin the DRM... */
#define DRM_DEBUG_CODE 2 /* Include debugging code (if > 1, then
#define DRM_DEBUG_CODE 0 /* Include debugging code (if > 1, then
also include looping detection. */
#define DRM_HASH_SIZE 16 /* Size of key hash table */

18
linux-core/drm_drv.c
View file

@ -924,7 +924,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
#endif
if ( !dev->lock.hw_lock ) {
/* Device has been unregistered */
retcode = -EINTR;
retcode = EINTR;
break;
}
if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
@ -947,7 +947,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
#ifdef __linux__
schedule();
if ( signal_pending( current ) ) {
retcode = -ERESTARTSYS;
retcode = ERESTARTSYS;
break;
}
#endif
@ -1028,7 +1028,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
if ( !--dev->open_count ) {
if ( atomic_read( &dev->ioctl_count ) || dev->blocked ) {
DRM_ERROR( "Device busy: %ld %d\n",
atomic_read( &dev->ioctl_count ),
(unsigned long)atomic_read( &dev->ioctl_count ),
dev->blocked );
DRM_OS_SPINUNLOCK( &dev->count_lock );
#ifdef __linux__
@ -1107,14 +1107,14 @@ int DRM(ioctl)( DRM_OS_IOCTL )
#endif
if ( nr >= DRIVER_IOCTL_COUNT ) {
retcode = -EINVAL;
retcode = EINVAL;
} else {
ioctl = &DRM(ioctls)[nr];
func = ioctl->func;
if ( !func ) {
DRM_DEBUG( "no function\n" );
retcode = -EINVAL;
retcode = EINVAL;
} else if ( ( ioctl->root_only &&
#ifdef __linux__
!capable( CAP_SYS_ADMIN ) )
@ -1123,7 +1123,7 @@ int DRM(ioctl)( DRM_OS_IOCTL )
suser(p) )
#endif
|| ( ioctl->auth_needed && !priv->authenticated ) ) {
retcode = -EACCES;
retcode = EACCES;
} else {
#ifdef __linux__
retcode = func( inode, filp, cmd, data );
@ -1135,7 +1135,7 @@ int DRM(ioctl)( DRM_OS_IOCTL )
}
atomic_dec( &dev->ioctl_count );
return retcode;
DRM_OS_RETURN(retcode);
}
int DRM(lock)( DRM_OS_IOCTL )
@ -1189,7 +1189,7 @@ int DRM(lock)( DRM_OS_IOCTL )
#endif
if ( !dev->lock.hw_lock ) {
/* Device has been unregistered */
ret = -EINTR;
ret = EINTR;
break;
}
if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
@ -1209,7 +1209,7 @@ int DRM(lock)( DRM_OS_IOCTL )
#ifdef __linux__
schedule();
if ( signal_pending( current ) ) {
ret = -ERESTARTSYS;
ret = ERESTARTSYS;
break;
}
#endif

2
linux-core/drm_fops.c
View file

@ -188,7 +188,9 @@ ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag)
int avail;
int send;
int cur;
#ifdef __FreeBSD__
int error = 0;
#endif
DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp);

2
linux-core/drm_memory.h
View file

@ -580,9 +580,11 @@ int DRM(unbind_agp)(agp_memory *handle)
return retcode;
}
#ifdef __FreeBSD__
agp_memory_info(dev, handle, &info);
if ((retcode = agp_unbind_memory(dev, handle)))
return retcode;
#endif
if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode;
DRM_OS_SPINLOCK(&DRM(mem_lock));

2
linux/drmP.h
View file

@ -74,7 +74,7 @@
/* Begin the DRM... */
#define DRM_DEBUG_CODE 2 /* Include debugging code (if > 1, then
#define DRM_DEBUG_CODE 0 /* Include debugging code (if > 1, then
also include looping detection. */
#define DRM_HASH_SIZE 16 /* Size of key hash table */

18
linux/drm_drv.h
View file

@ -924,7 +924,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
#endif
if ( !dev->lock.hw_lock ) {
/* Device has been unregistered */
retcode = -EINTR;
retcode = EINTR;
break;
}
if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
@ -947,7 +947,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
#ifdef __linux__
schedule();
if ( signal_pending( current ) ) {
retcode = -ERESTARTSYS;
retcode = ERESTARTSYS;
break;
}
#endif
@ -1028,7 +1028,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
if ( !--dev->open_count ) {
if ( atomic_read( &dev->ioctl_count ) || dev->blocked ) {
DRM_ERROR( "Device busy: %ld %d\n",
atomic_read( &dev->ioctl_count ),
(unsigned long)atomic_read( &dev->ioctl_count ),
dev->blocked );
DRM_OS_SPINUNLOCK( &dev->count_lock );
#ifdef __linux__
@ -1107,14 +1107,14 @@ int DRM(ioctl)( DRM_OS_IOCTL )
#endif
if ( nr >= DRIVER_IOCTL_COUNT ) {
retcode = -EINVAL;
retcode = EINVAL;
} else {
ioctl = &DRM(ioctls)[nr];
func = ioctl->func;
if ( !func ) {
DRM_DEBUG( "no function\n" );
retcode = -EINVAL;
retcode = EINVAL;
} else if ( ( ioctl->root_only &&
#ifdef __linux__
!capable( CAP_SYS_ADMIN ) )
@ -1123,7 +1123,7 @@ int DRM(ioctl)( DRM_OS_IOCTL )
suser(p) )
#endif
|| ( ioctl->auth_needed && !priv->authenticated ) ) {
retcode = -EACCES;
retcode = EACCES;
} else {
#ifdef __linux__
retcode = func( inode, filp, cmd, data );
@ -1135,7 +1135,7 @@ int DRM(ioctl)( DRM_OS_IOCTL )
}
atomic_dec( &dev->ioctl_count );
return retcode;
DRM_OS_RETURN(retcode);
}
int DRM(lock)( DRM_OS_IOCTL )
@ -1189,7 +1189,7 @@ int DRM(lock)( DRM_OS_IOCTL )
#endif
if ( !dev->lock.hw_lock ) {
/* Device has been unregistered */
ret = -EINTR;
ret = EINTR;
break;
}
if ( DRM(lock_take)( &dev->lock.hw_lock->lock,
@ -1209,7 +1209,7 @@ int DRM(lock)( DRM_OS_IOCTL )
#ifdef __linux__
schedule();
if ( signal_pending( current ) ) {
ret = -ERESTARTSYS;
ret = ERESTARTSYS;
break;
}
#endif

2
linux/drm_fops.h
View file

@ -188,7 +188,9 @@ ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag)
int avail;
int send;
int cur;
#ifdef __FreeBSD__
int error = 0;
#endif
DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp);

2
linux/drm_memory.h
View file

@ -580,9 +580,11 @@ int DRM(unbind_agp)(agp_memory *handle)
return retcode;
}
#ifdef __FreeBSD__
agp_memory_info(dev, handle, &info);
if ((retcode = agp_unbind_memory(dev, handle)))
return retcode;
#endif
if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode;
DRM_OS_SPINLOCK(&DRM(mem_lock));