mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2026-05-08 12:48:05 +02:00
Multiple outstanding dma requests and no queueing for the i810
This commit is contained in:
Jeff Hartmann
parent
71f5f1de26
commit
e1f5452b77
12 changed files with 964 additions and 1553 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -585,24 +585,82 @@ int i810_release(struct inode *inode, struct file *filp)
|
|||
drm_device_t *dev = priv->dev;
|
||||
int retcode = 0;
|
||||
|
||||
DRM_DEBUG("open_count = %d\n", dev->open_count);
|
||||
if (!(retcode = drm_release(inode, filp))) {
|
||||
MOD_DEC_USE_COUNT;
|
||||
atomic_inc(&dev->total_close);
|
||||
spin_lock(&dev->count_lock);
|
||||
if (!--dev->open_count) {
|
||||
if (atomic_read(&dev->ioctl_count) || dev->blocked) {
|
||||
DRM_ERROR("Device busy: %d %d\n",
|
||||
atomic_read(&dev->ioctl_count),
|
||||
dev->blocked);
|
||||
spin_unlock(&dev->count_lock);
|
||||
return -EBUSY;
|
||||
DRM_DEBUG("pid = %d, device = 0x%x, open_count = %d\n",
|
||||
current->pid, dev->device, dev->open_count);
|
||||
|
||||
if (_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)
|
||||
&& dev->lock.pid == current->pid) {
|
||||
i810_reclaim_buffers(dev, priv->pid);
|
||||
DRM_ERROR("Process %d dead, freeing lock for context %d\n",
|
||||
current->pid,
|
||||
_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
|
||||
drm_lock_free(dev,
|
||||
&dev->lock.hw_lock->lock,
|
||||
_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
|
||||
|
||||
/* FIXME: may require heavy-handed reset of
|
||||
hardware at this point, possibly
|
||||
processed via a callback to the X
|
||||
server. */
|
||||
} else {
|
||||
/* The lock is required to reclaim buffers */
|
||||
DECLARE_WAITQUEUE(entry, current);
|
||||
add_wait_queue(&dev->lock.lock_queue, &entry);
|
||||
for (;;) {
|
||||
if (!dev->lock.hw_lock) {
|
||||
/* Device has been unregistered */
|
||||
retcode = -EINTR;
|
||||
break;
|
||||
}
|
||||
if (drm_lock_take(&dev->lock.hw_lock->lock,
|
||||
DRM_KERNEL_CONTEXT)) {
|
||||
dev->lock.pid = priv->pid;
|
||||
dev->lock.lock_time = jiffies;
|
||||
atomic_inc(&dev->total_locks);
|
||||
break; /* Got lock */
|
||||
}
|
||||
/* Contention */
|
||||
atomic_inc(&dev->total_sleeps);
|
||||
current->state = TASK_INTERRUPTIBLE;
|
||||
schedule();
|
||||
if (signal_pending(current)) {
|
||||
retcode = -ERESTARTSYS;
|
||||
break;
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
return i810_takedown(dev);
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
current->state = TASK_RUNNING;
|
||||
remove_wait_queue(&dev->lock.lock_queue, &entry);
|
||||
if(!retcode) {
|
||||
i810_reclaim_buffers(dev, priv->pid);
|
||||
drm_lock_free(dev, &dev->lock.hw_lock->lock,
|
||||
DRM_KERNEL_CONTEXT);
|
||||
}
|
||||
}
|
||||
drm_fasync(-1, filp, 0);
|
||||
|
||||
down(&dev->struct_sem);
|
||||
if (priv->prev) priv->prev->next = priv->next;
|
||||
else dev->file_first = priv->next;
|
||||
if (priv->next) priv->next->prev = priv->prev;
|
||||
else dev->file_last = priv->prev;
|
||||
up(&dev->struct_sem);
|
||||
|
||||
drm_free(priv, sizeof(*priv), DRM_MEM_FILES);
|
||||
MOD_DEC_USE_COUNT;
|
||||
atomic_inc(&dev->total_close);
|
||||
spin_lock(&dev->count_lock);
|
||||
if (!--dev->open_count) {
|
||||
if (atomic_read(&dev->ioctl_count) || dev->blocked) {
|
||||
DRM_ERROR("Device busy: %d %d\n",
|
||||
atomic_read(&dev->ioctl_count),
|
||||
dev->blocked);
|
||||
spin_unlock(&dev->count_lock);
|
||||
return -EBUSY;
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
return i810_takedown(dev);
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
return retcode;
|
||||
}
|
||||
|
||||
|
|
@ -667,8 +725,7 @@ int i810_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
|
|||
atomic_inc(&dev->total_unlocks);
|
||||
if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
|
||||
atomic_inc(&dev->total_contends);
|
||||
drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
|
||||
i810_dma_schedule(dev, 1);
|
||||
drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
|
||||
if (!dev->context_flag) {
|
||||
if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
|
||||
DRM_KERNEL_CONTEXT)) {
|
||||
|
|
|
|||
|
|
@ -54,10 +54,8 @@ typedef struct drm_i810_private {
|
|||
unsigned long hw_status_page;
|
||||
unsigned long counter;
|
||||
|
||||
atomic_t dispatch_lock;
|
||||
atomic_t pending_bufs;
|
||||
atomic_t in_flush;
|
||||
|
||||
atomic_t flush_done;
|
||||
wait_queue_head_t flush_queue; /* Processes waiting until flush */
|
||||
} drm_i810_private_t;
|
||||
|
||||
/* i810_drv.c */
|
||||
|
|
@ -86,6 +84,8 @@ extern int i810_dma_init(struct inode *inode, struct file *filp,
|
|||
unsigned int cmd, unsigned long arg);
|
||||
extern int i810_flush_ioctl(struct inode *inode, struct file *filp,
|
||||
unsigned int cmd, unsigned long arg);
|
||||
extern void i810_reclaim_buffers(drm_device_t *dev, pid_t pid);
|
||||
|
||||
|
||||
/* i810_bufs.c */
|
||||
extern int i810_addbufs(struct inode *inode, struct file *filp,
|
||||
|
|
|
|||
|
|
@ -78,9 +78,8 @@ MGAHEADERS= mga_drv.h mga_drm_public.h $(DRMHEADERS)
|
|||
R128OBJS= r128_drv.o r128_context.o
|
||||
R128HEADERS= r128_drv.h $(DRMHEADERS)
|
||||
|
||||
I810OBJS= i810_drv.o i810_dma.o i810_bufs.o i810_context.o \
|
||||
i810_clear.o
|
||||
I810HEADERS= i810_drv.h $(DRMHEADERS)
|
||||
I810OBJS= i810_drv.o i810_dma.o i810_bufs.o i810_context.o
|
||||
I810HEADERS= i810_drv.h i810_drm_public.h $(DRMHEADERS)
|
||||
|
||||
PROGOBJS= drmstat.po xf86drm.po xf86drmHash.po xf86drmRandom.po sigio.po
|
||||
PROGHEADERS= xf86drm.h $(DRMHEADERS)
|
||||
|
|
@ -157,331 +156,3 @@ $(PROGOBJS): $(PROGHEADERS)
|
|||
clean:
|
||||
rm -f *.o *.a *.po *~ core $(PROGS)
|
||||
|
||||
# DO NOT DELETE
|
||||
|
||||
agpsupport.o: drmP.h
|
||||
auth.o: drmP.h
|
||||
bufs.o: drmP.h /usr/include/linux/un.h
|
||||
context.o: drmP.h
|
||||
ctxbitmap.o: drmP.h
|
||||
dma.o: drmP.h /usr/include/linux/interrupt.h /usr/include/linux/kernel.h
|
||||
dma.o: /usr/include/asm/bitops.h /usr/include/asm/atomic.h
|
||||
dma.o: /usr/include/asm/hardirq.h /usr/include/linux/threads.h
|
||||
dma.o: /usr/include/asm/softirq.h
|
||||
drawable.o: drmP.h
|
||||
drm.o: /usr/include/asm/ioctl.h
|
||||
drmstat.o: /usr/include/stdio.h /usr/include/features.h
|
||||
drmstat.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
|
||||
drmstat.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
|
||||
drmstat.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
|
||||
drmstat.o: /usr/include/bits/types.h /usr/include/libio.h
|
||||
drmstat.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
|
||||
drmstat.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
|
||||
drmstat.o: /usr/include/endian.h /usr/include/bits/endian.h
|
||||
drmstat.o: /usr/include/sys/select.h /usr/include/bits/select.h
|
||||
drmstat.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
|
||||
drmstat.o: /usr/include/alloca.h /usr/include/unistd.h
|
||||
drmstat.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
|
||||
drmstat.o: /usr/include/getopt.h /usr/include/sys/time.h
|
||||
drmstat.o: /usr/include/bits/time.h /usr/include/sys/mman.h
|
||||
drmstat.o: /usr/include/bits/mman.h /usr/include/strings.h
|
||||
drmstat.o: /usr/include/errno.h /usr/include/bits/errno.h
|
||||
drmstat.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
|
||||
drmstat.o: /usr/include/signal.h /usr/include/bits/signum.h
|
||||
drmstat.o: /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h
|
||||
drmstat.o: /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h
|
||||
drmstat.o: /usr/include/bits/sigstack.h /usr/include/fcntl.h
|
||||
drmstat.o: /usr/include/bits/fcntl.h xf86drm.h
|
||||
fops.o: drmP.h /usr/include/linux/poll.h /usr/include/asm/poll.h
|
||||
gamma_dma.o: drmP.h gamma_drv.h /usr/include/linux/interrupt.h
|
||||
gamma_dma.o: /usr/include/linux/kernel.h /usr/include/asm/bitops.h
|
||||
gamma_dma.o: /usr/include/asm/atomic.h /usr/include/asm/hardirq.h
|
||||
gamma_dma.o: /usr/include/linux/threads.h /usr/include/asm/softirq.h
|
||||
gamma_drv.o: drmP.h gamma_drv.h
|
||||
i810_bufs.o: drmP.h i810_drv.h i810_drm_public.h i810_dma.h
|
||||
i810_bufs.o: /usr/include/linux/un.h
|
||||
i810_clear.o: drmP.h i810_drv.h i810_drm_public.h i810_dma.h
|
||||
i810_context.o: /usr/include/linux/sched.h /usr/include/asm/param.h
|
||||
i810_context.o: /usr/include/linux/binfmts.h /usr/include/linux/ptrace.h
|
||||
i810_context.o: /usr/include/asm/ptrace.h /usr/include/linux/capability.h
|
||||
i810_context.o: /usr/include/linux/types.h /usr/include/linux/config.h
|
||||
i810_context.o: /usr/include/linux/autoconf.h
|
||||
i810_context.o: /usr/include/linux/posix_types.h /usr/include/linux/stddef.h
|
||||
i810_context.o: /usr/include/asm/posix_types.h /usr/include/asm/types.h
|
||||
i810_context.o: /usr/include/linux/fs.h /usr/include/linux/linkage.h
|
||||
i810_context.o: /usr/include/linux/limits.h /usr/include/linux/wait.h
|
||||
i810_context.o: /usr/include/linux/vfs.h /usr/include/asm/statfs.h
|
||||
i810_context.o: /usr/include/linux/net.h /usr/include/linux/socket.h
|
||||
i810_context.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
|
||||
i810_context.o: /usr/include/linux/sockios.h /usr/include/linux/uio.h
|
||||
i810_context.o: /usr/include/linux/kdev_t.h /usr/include/linux/ioctl.h
|
||||
i810_context.o: /usr/include/asm/ioctl.h /usr/include/linux/list.h
|
||||
i810_context.o: /usr/include/linux/dcache.h /usr/include/linux/stat.h
|
||||
i810_context.o: /usr/include/linux/cache.h /usr/include/asm/cache.h
|
||||
i810_context.o: /usr/include/asm/atomic.h /usr/include/asm/bitops.h
|
||||
i810_context.o: /usr/include/linux/personality.h /usr/include/linux/threads.h
|
||||
i810_context.o: /usr/include/linux/kernel.h /usr/include/linux/times.h
|
||||
i810_context.o: /usr/include/linux/timex.h /usr/include/asm/timex.h
|
||||
i810_context.o: /usr/include/asm/msr.h /usr/include/asm/system.h
|
||||
i810_context.o: /usr/include/asm/segment.h /usr/include/linux/bitops.h
|
||||
i810_context.o: /usr/include/asm/semaphore.h /usr/include/asm/rwlock.h
|
||||
i810_context.o: /usr/include/asm/page.h /usr/include/linux/smp.h
|
||||
i810_context.o: /usr/include/linux/tty.h /usr/include/linux/sem.h
|
||||
i810_context.o: /usr/include/linux/ipc.h /usr/include/asm/ipcbuf.h
|
||||
i810_context.o: /usr/include/asm/sembuf.h /usr/include/linux/signal.h
|
||||
i810_context.o: /usr/include/asm/signal.h /usr/include/asm/siginfo.h
|
||||
i810_context.o: /usr/include/linux/securebits.h /usr/include/linux/time.h
|
||||
i810_context.o: /usr/include/linux/param.h /usr/include/linux/resource.h
|
||||
i810_context.o: /usr/include/asm/resource.h /usr/include/linux/timer.h
|
||||
i810_context.o: /usr/include/asm/processor.h /usr/include/asm/vm86.h
|
||||
i810_context.o: /usr/include/asm/math_emu.h /usr/include/asm/sigcontext.h
|
||||
i810_context.o: drmP.h i810_drv.h i810_drm_public.h
|
||||
i810_dma.o: drmP.h i810_drm_public.h i810_drv.h i810_dma.h
|
||||
i810_dma.o: /usr/include/linux/interrupt.h /usr/include/linux/kernel.h
|
||||
i810_dma.o: /usr/include/asm/bitops.h /usr/include/asm/atomic.h
|
||||
i810_dma.o: /usr/include/asm/hardirq.h /usr/include/linux/threads.h
|
||||
i810_dma.o: /usr/include/asm/softirq.h /usr/include/linux/time.h
|
||||
i810_dma.o: /usr/include/asm/param.h /usr/include/linux/types.h
|
||||
i810_dma.o: /usr/include/linux/config.h /usr/include/linux/autoconf.h
|
||||
i810_dma.o: /usr/include/linux/posix_types.h /usr/include/linux/stddef.h
|
||||
i810_dma.o: /usr/include/asm/posix_types.h /usr/include/asm/types.h
|
||||
i810_dma.o: i810_drm_public.h
|
||||
i810_dma_jeff.o: drmP.h i810_drm_public.h i810_drv.h
|
||||
i810_dma_jeff.o: /usr/include/linux/interrupt.h /usr/include/linux/kernel.h
|
||||
i810_dma_jeff.o: /usr/include/asm/bitops.h /usr/include/asm/atomic.h
|
||||
i810_dma_jeff.o: /usr/include/asm/hardirq.h /usr/include/linux/threads.h
|
||||
i810_dma_jeff.o: /usr/include/asm/softirq.h /usr/include/linux/time.h
|
||||
i810_dma_jeff.o: /usr/include/asm/param.h /usr/include/linux/types.h
|
||||
i810_dma_jeff.o: /usr/include/linux/config.h /usr/include/linux/autoconf.h
|
||||
i810_dma_jeff.o: /usr/include/linux/posix_types.h /usr/include/linux/stddef.h
|
||||
i810_dma_jeff.o: /usr/include/asm/posix_types.h /usr/include/asm/types.h
|
||||
i810_dmamine.o: drmP.h i810_drm_public.h i810_drv.h i810_dma.h
|
||||
i810_dmamine.o: /usr/include/linux/interrupt.h /usr/include/linux/kernel.h
|
||||
i810_dmamine.o: /usr/include/asm/bitops.h /usr/include/asm/atomic.h
|
||||
i810_dmamine.o: /usr/include/asm/hardirq.h /usr/include/linux/threads.h
|
||||
i810_dmamine.o: /usr/include/asm/softirq.h /usr/include/linux/time.h
|
||||
i810_dmamine.o: /usr/include/asm/param.h /usr/include/linux/types.h
|
||||
i810_dmamine.o: /usr/include/linux/config.h /usr/include/linux/autoconf.h
|
||||
i810_dmamine.o: /usr/include/linux/posix_types.h /usr/include/linux/stddef.h
|
||||
i810_dmamine.o: /usr/include/asm/posix_types.h /usr/include/asm/types.h
|
||||
i810_drv.o: drmP.h i810_drv.h i810_drm_public.h i810_dma.h
|
||||
i810_drv.o: i810_drm_public.h
|
||||
init.o: drmP.h
|
||||
ioctl.o: drmP.h
|
||||
lists.o: drmP.h
|
||||
lock.o: drmP.h
|
||||
memory.o: drmP.h
|
||||
mga_bufs.o: drmP.h mga_drv.h mga_drm_public.h mga_dma.h
|
||||
mga_bufs.o: /usr/include/linux/un.h
|
||||
mga_clear.o: drmP.h mga_drv.h mga_drm_public.h mgareg_flags.h mga_dma.h
|
||||
mga_clear.o: mga_state.h
|
||||
mga_context.o: /usr/include/linux/sched.h /usr/include/asm/param.h
|
||||
mga_context.o: /usr/include/linux/binfmts.h /usr/include/linux/ptrace.h
|
||||
mga_context.o: /usr/include/asm/ptrace.h /usr/include/linux/capability.h
|
||||
mga_context.o: /usr/include/linux/types.h /usr/include/linux/config.h
|
||||
mga_context.o: /usr/include/linux/autoconf.h /usr/include/linux/posix_types.h
|
||||
mga_context.o: /usr/include/linux/stddef.h /usr/include/asm/posix_types.h
|
||||
mga_context.o: /usr/include/asm/types.h /usr/include/linux/fs.h
|
||||
mga_context.o: /usr/include/linux/linkage.h /usr/include/linux/limits.h
|
||||
mga_context.o: /usr/include/linux/wait.h /usr/include/linux/vfs.h
|
||||
mga_context.o: /usr/include/asm/statfs.h /usr/include/linux/net.h
|
||||
mga_context.o: /usr/include/linux/socket.h /usr/include/asm/socket.h
|
||||
mga_context.o: /usr/include/asm/sockios.h /usr/include/linux/sockios.h
|
||||
mga_context.o: /usr/include/linux/uio.h /usr/include/linux/kdev_t.h
|
||||
mga_context.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h
|
||||
mga_context.o: /usr/include/linux/list.h /usr/include/linux/dcache.h
|
||||
mga_context.o: /usr/include/linux/stat.h /usr/include/linux/cache.h
|
||||
mga_context.o: /usr/include/asm/cache.h /usr/include/asm/atomic.h
|
||||
mga_context.o: /usr/include/asm/bitops.h /usr/include/linux/personality.h
|
||||
mga_context.o: /usr/include/linux/threads.h /usr/include/linux/kernel.h
|
||||
mga_context.o: /usr/include/linux/times.h /usr/include/linux/timex.h
|
||||
mga_context.o: /usr/include/asm/timex.h /usr/include/asm/msr.h
|
||||
mga_context.o: /usr/include/asm/system.h /usr/include/asm/segment.h
|
||||
mga_context.o: /usr/include/linux/bitops.h /usr/include/asm/semaphore.h
|
||||
mga_context.o: /usr/include/asm/rwlock.h /usr/include/asm/page.h
|
||||
mga_context.o: /usr/include/linux/smp.h /usr/include/linux/tty.h
|
||||
mga_context.o: /usr/include/linux/sem.h /usr/include/linux/ipc.h
|
||||
mga_context.o: /usr/include/asm/ipcbuf.h /usr/include/asm/sembuf.h
|
||||
mga_context.o: /usr/include/linux/signal.h /usr/include/asm/signal.h
|
||||
mga_context.o: /usr/include/asm/siginfo.h /usr/include/linux/securebits.h
|
||||
mga_context.o: /usr/include/linux/time.h /usr/include/linux/param.h
|
||||
mga_context.o: /usr/include/linux/resource.h /usr/include/asm/resource.h
|
||||
mga_context.o: /usr/include/linux/timer.h /usr/include/asm/processor.h
|
||||
mga_context.o: /usr/include/asm/vm86.h /usr/include/asm/math_emu.h
|
||||
mga_context.o: /usr/include/asm/sigcontext.h drmP.h mga_drv.h
|
||||
mga_context.o: mga_drm_public.h
|
||||
mga_dma.o: drmP.h mga_drv.h mga_drm_public.h mgareg_flags.h mga_dma.h
|
||||
mga_dma.o: mga_state.h /usr/include/linux/interrupt.h
|
||||
mga_dma.o: /usr/include/linux/kernel.h /usr/include/asm/bitops.h
|
||||
mga_dma.o: /usr/include/asm/atomic.h /usr/include/asm/hardirq.h
|
||||
mga_dma.o: /usr/include/linux/threads.h /usr/include/asm/softirq.h
|
||||
mga_dma.o: mga_drm_public.h
|
||||
mga_dma_mine.o: drmP.h mga_drv.h mga_drm_public.h mgareg_flags.h mga_dma.h
|
||||
mga_dma_mine.o: mga_state.h /usr/include/linux/interrupt.h
|
||||
mga_dma_mine.o: /usr/include/linux/kernel.h /usr/include/asm/bitops.h
|
||||
mga_dma_mine.o: /usr/include/asm/atomic.h /usr/include/asm/hardirq.h
|
||||
mga_dma_mine.o: /usr/include/linux/threads.h /usr/include/asm/softirq.h
|
||||
mga_dmapoll.o: drmP.h mga_drv.h mga_drm_public.h mgareg_flags.h mga_dma.h
|
||||
mga_dmapoll.o: mga_state.h /usr/include/linux/interrupt.h
|
||||
mga_dmapoll.o: /usr/include/linux/kernel.h /usr/include/asm/bitops.h
|
||||
mga_dmapoll.o: /usr/include/asm/atomic.h /usr/include/asm/hardirq.h
|
||||
mga_dmapoll.o: /usr/include/linux/threads.h /usr/include/asm/softirq.h
|
||||
mga_drv.o: drmP.h mga_drv.h mga_drm_public.h
|
||||
mga_drv.o: mga_drm_public.h
|
||||
mga_state.o: drmP.h mga_drv.h mga_drm_public.h mgareg_flags.h mga_dma.h
|
||||
mga_state.o: mga_state.h drm.h /usr/include/asm/ioctl.h
|
||||
mga_state.o: mga_drv.h mga_drm_public.h
|
||||
proc.o: drmP.h
|
||||
r128_context.o: /usr/include/linux/sched.h /usr/include/asm/param.h
|
||||
r128_context.o: /usr/include/linux/binfmts.h /usr/include/linux/ptrace.h
|
||||
r128_context.o: /usr/include/asm/ptrace.h /usr/include/linux/capability.h
|
||||
r128_context.o: /usr/include/linux/types.h /usr/include/linux/config.h
|
||||
r128_context.o: /usr/include/linux/autoconf.h
|
||||
r128_context.o: /usr/include/linux/posix_types.h /usr/include/linux/stddef.h
|
||||
r128_context.o: /usr/include/asm/posix_types.h /usr/include/asm/types.h
|
||||
r128_context.o: /usr/include/linux/fs.h /usr/include/linux/linkage.h
|
||||
r128_context.o: /usr/include/linux/limits.h /usr/include/linux/wait.h
|
||||
r128_context.o: /usr/include/linux/vfs.h /usr/include/asm/statfs.h
|
||||
r128_context.o: /usr/include/linux/net.h /usr/include/linux/socket.h
|
||||
r128_context.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
|
||||
r128_context.o: /usr/include/linux/sockios.h /usr/include/linux/uio.h
|
||||
r128_context.o: /usr/include/linux/kdev_t.h /usr/include/linux/ioctl.h
|
||||
r128_context.o: /usr/include/asm/ioctl.h /usr/include/linux/list.h
|
||||
r128_context.o: /usr/include/linux/dcache.h /usr/include/linux/stat.h
|
||||
r128_context.o: /usr/include/linux/cache.h /usr/include/asm/cache.h
|
||||
r128_context.o: /usr/include/asm/atomic.h /usr/include/asm/bitops.h
|
||||
r128_context.o: /usr/include/linux/personality.h /usr/include/linux/threads.h
|
||||
r128_context.o: /usr/include/linux/kernel.h /usr/include/linux/times.h
|
||||
r128_context.o: /usr/include/linux/timex.h /usr/include/asm/timex.h
|
||||
r128_context.o: /usr/include/asm/msr.h /usr/include/asm/system.h
|
||||
r128_context.o: /usr/include/asm/segment.h /usr/include/linux/bitops.h
|
||||
r128_context.o: /usr/include/asm/semaphore.h /usr/include/asm/rwlock.h
|
||||
r128_context.o: /usr/include/asm/page.h /usr/include/linux/smp.h
|
||||
r128_context.o: /usr/include/linux/tty.h /usr/include/linux/sem.h
|
||||
r128_context.o: /usr/include/linux/ipc.h /usr/include/asm/ipcbuf.h
|
||||
r128_context.o: /usr/include/asm/sembuf.h /usr/include/linux/signal.h
|
||||
r128_context.o: /usr/include/asm/signal.h /usr/include/asm/siginfo.h
|
||||
r128_context.o: /usr/include/linux/securebits.h /usr/include/linux/time.h
|
||||
r128_context.o: /usr/include/linux/param.h /usr/include/linux/resource.h
|
||||
r128_context.o: /usr/include/asm/resource.h /usr/include/linux/timer.h
|
||||
r128_context.o: /usr/include/asm/processor.h /usr/include/asm/vm86.h
|
||||
r128_context.o: /usr/include/asm/math_emu.h /usr/include/asm/sigcontext.h
|
||||
r128_context.o: drmP.h r128_drv.h
|
||||
r128_drv.o: drmP.h r128_drv.h
|
||||
sigio.o: /usr/include/unistd.h /usr/include/features.h
|
||||
sigio.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
|
||||
sigio.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h
|
||||
sigio.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
|
||||
sigio.o: /usr/include/bits/confname.h /usr/include/getopt.h
|
||||
sigio.o: /usr/include/signal.h /usr/include/bits/sigset.h
|
||||
sigio.o: /usr/include/bits/signum.h /usr/include/time.h
|
||||
sigio.o: /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h
|
||||
sigio.o: /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h
|
||||
sigio.o: /usr/include/bits/sigstack.h /usr/include/fcntl.h
|
||||
sigio.o: /usr/include/bits/fcntl.h /usr/include/sys/types.h
|
||||
sigio.o: /usr/include/endian.h /usr/include/bits/endian.h
|
||||
sigio.o: /usr/include/sys/select.h /usr/include/bits/select.h
|
||||
sigio.o: /usr/include/sys/sysmacros.h /usr/include/sys/time.h
|
||||
sigio.o: /usr/include/bits/time.h /usr/include/errno.h
|
||||
sigio.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
|
||||
sigio.o: /usr/include/asm/errno.h /usr/include/stdio.h
|
||||
sigio.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
|
||||
sigio.o: /usr/include/libio.h /usr/include/_G_config.h
|
||||
sigio.o: /usr/include/bits/stdio_lim.h /usr/include/string.h
|
||||
tdfx_context.o: /usr/include/linux/sched.h /usr/include/asm/param.h
|
||||
tdfx_context.o: /usr/include/linux/binfmts.h /usr/include/linux/ptrace.h
|
||||
tdfx_context.o: /usr/include/asm/ptrace.h /usr/include/linux/capability.h
|
||||
tdfx_context.o: /usr/include/linux/types.h /usr/include/linux/config.h
|
||||
tdfx_context.o: /usr/include/linux/autoconf.h
|
||||
tdfx_context.o: /usr/include/linux/posix_types.h /usr/include/linux/stddef.h
|
||||
tdfx_context.o: /usr/include/asm/posix_types.h /usr/include/asm/types.h
|
||||
tdfx_context.o: /usr/include/linux/fs.h /usr/include/linux/linkage.h
|
||||
tdfx_context.o: /usr/include/linux/limits.h /usr/include/linux/wait.h
|
||||
tdfx_context.o: /usr/include/linux/vfs.h /usr/include/asm/statfs.h
|
||||
tdfx_context.o: /usr/include/linux/net.h /usr/include/linux/socket.h
|
||||
tdfx_context.o: /usr/include/asm/socket.h /usr/include/asm/sockios.h
|
||||
tdfx_context.o: /usr/include/linux/sockios.h /usr/include/linux/uio.h
|
||||
tdfx_context.o: /usr/include/linux/kdev_t.h /usr/include/linux/ioctl.h
|
||||
tdfx_context.o: /usr/include/asm/ioctl.h /usr/include/linux/list.h
|
||||
tdfx_context.o: /usr/include/linux/dcache.h /usr/include/linux/stat.h
|
||||
tdfx_context.o: /usr/include/linux/cache.h /usr/include/asm/cache.h
|
||||
tdfx_context.o: /usr/include/asm/atomic.h /usr/include/asm/bitops.h
|
||||
tdfx_context.o: /usr/include/linux/personality.h /usr/include/linux/threads.h
|
||||
tdfx_context.o: /usr/include/linux/kernel.h /usr/include/linux/times.h
|
||||
tdfx_context.o: /usr/include/linux/timex.h /usr/include/asm/timex.h
|
||||
tdfx_context.o: /usr/include/asm/msr.h /usr/include/asm/system.h
|
||||
tdfx_context.o: /usr/include/asm/segment.h /usr/include/linux/bitops.h
|
||||
tdfx_context.o: /usr/include/asm/semaphore.h /usr/include/asm/rwlock.h
|
||||
tdfx_context.o: /usr/include/asm/page.h /usr/include/linux/smp.h
|
||||
tdfx_context.o: /usr/include/linux/tty.h /usr/include/linux/sem.h
|
||||
tdfx_context.o: /usr/include/linux/ipc.h /usr/include/asm/ipcbuf.h
|
||||
tdfx_context.o: /usr/include/asm/sembuf.h /usr/include/linux/signal.h
|
||||
tdfx_context.o: /usr/include/asm/signal.h /usr/include/asm/siginfo.h
|
||||
tdfx_context.o: /usr/include/linux/securebits.h /usr/include/linux/time.h
|
||||
tdfx_context.o: /usr/include/linux/param.h /usr/include/linux/resource.h
|
||||
tdfx_context.o: /usr/include/asm/resource.h /usr/include/linux/timer.h
|
||||
tdfx_context.o: /usr/include/asm/processor.h /usr/include/asm/vm86.h
|
||||
tdfx_context.o: /usr/include/asm/math_emu.h /usr/include/asm/sigcontext.h
|
||||
tdfx_context.o: drmP.h tdfx_drv.h
|
||||
tdfx_drv.o: drmP.h tdfx_drv.h
|
||||
vm.o: drmP.h
|
||||
xf86_OSproc.o: /usr/include/X11/Xfuncproto.h
|
||||
xf86drm.o: /usr/include/stdio.h /usr/include/features.h
|
||||
xf86drm.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
|
||||
xf86drm.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
|
||||
xf86drm.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
|
||||
xf86drm.o: /usr/include/bits/types.h /usr/include/libio.h
|
||||
xf86drm.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
|
||||
xf86drm.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h
|
||||
xf86drm.o: /usr/include/endian.h /usr/include/bits/endian.h
|
||||
xf86drm.o: /usr/include/sys/select.h /usr/include/bits/select.h
|
||||
xf86drm.o: /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h
|
||||
xf86drm.o: /usr/include/alloca.h /usr/include/unistd.h
|
||||
xf86drm.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
|
||||
xf86drm.o: /usr/include/getopt.h /usr/include/string.h /usr/include/ctype.h
|
||||
xf86drm.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h
|
||||
xf86drm.o: /usr/include/errno.h /usr/include/bits/errno.h
|
||||
xf86drm.o: /usr/include/linux/errno.h /usr/include/asm/errno.h
|
||||
xf86drm.o: /usr/include/signal.h /usr/include/bits/signum.h
|
||||
xf86drm.o: /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h
|
||||
xf86drm.o: /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h
|
||||
xf86drm.o: /usr/include/bits/sigstack.h /usr/include/sys/stat.h
|
||||
xf86drm.o: /usr/include/bits/stat.h /usr/include/sys/ioctl.h
|
||||
xf86drm.o: /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h
|
||||
xf86drm.o: /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h
|
||||
xf86drm.o: /usr/include/sys/ttydefaults.h /usr/include/sys/mman.h
|
||||
xf86drm.o: /usr/include/bits/mman.h /usr/include/sys/time.h
|
||||
xf86drm.o: /usr/include/bits/time.h xf86drm.h drm.h
|
||||
xf86drmHash.o: xf86drm.h /usr/include/stdio.h /usr/include/features.h
|
||||
xf86drmHash.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
|
||||
xf86drmHash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
|
||||
xf86drmHash.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
|
||||
xf86drmHash.o: /usr/include/bits/types.h /usr/include/libio.h
|
||||
xf86drmHash.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
|
||||
xf86drmHash.o: /usr/include/stdlib.h /usr/include/sys/types.h
|
||||
xf86drmHash.o: /usr/include/time.h /usr/include/endian.h
|
||||
xf86drmHash.o: /usr/include/bits/endian.h /usr/include/sys/select.h
|
||||
xf86drmHash.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
|
||||
xf86drmHash.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
|
||||
xf86drmRandom.o: xf86drm.h /usr/include/stdio.h /usr/include/features.h
|
||||
xf86drmRandom.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
|
||||
xf86drmRandom.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
|
||||
xf86drmRandom.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
|
||||
xf86drmRandom.o: /usr/include/bits/types.h /usr/include/libio.h
|
||||
xf86drmRandom.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
|
||||
xf86drmRandom.o: /usr/include/stdlib.h /usr/include/sys/types.h
|
||||
xf86drmRandom.o: /usr/include/time.h /usr/include/endian.h
|
||||
xf86drmRandom.o: /usr/include/bits/endian.h /usr/include/sys/select.h
|
||||
xf86drmRandom.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
|
||||
xf86drmRandom.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
|
||||
xf86drmSL.o: xf86drm.h /usr/include/stdio.h /usr/include/features.h
|
||||
xf86drmSL.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
|
||||
xf86drmSL.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stddef.h
|
||||
xf86drmSL.o: /usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66/include/stdarg.h
|
||||
xf86drmSL.o: /usr/include/bits/types.h /usr/include/libio.h
|
||||
xf86drmSL.o: /usr/include/_G_config.h /usr/include/bits/stdio_lim.h
|
||||
xf86drmSL.o: /usr/include/stdlib.h /usr/include/sys/types.h
|
||||
xf86drmSL.o: /usr/include/time.h /usr/include/endian.h
|
||||
xf86drmSL.o: /usr/include/bits/endian.h /usr/include/sys/select.h
|
||||
xf86drmSL.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
|
||||
xf86drmSL.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h
|
||||
|
|
|
|||
|
|
@ -1,217 +0,0 @@
|
|||
/* i810_state.c -- State support for i810 g200/g400 -*- linux-c -*-
|
||||
*
|
||||
* Created: February 2000 by keithw@precisioninsight.com
|
||||
*
|
||||
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* 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 <keithw@precisioninsight.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#define __NO_VERSION__
|
||||
#include "drmP.h"
|
||||
#include "i810_drv.h"
|
||||
#include "i810_dma.h"
|
||||
#include "i810_drm_public.h"
|
||||
|
||||
|
||||
|
||||
static int i810DmaGeneral(drm_device_t *dev, drm_i810_general_t *args)
|
||||
{
|
||||
drm_device_dma_t *dma = dev->dma;
|
||||
drm_buf_t *buf = dma->buflist[ args->idx ];
|
||||
drm_i810_buf_priv_t *buf_priv = (drm_i810_buf_priv_t *)buf->dev_private;
|
||||
drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
|
||||
drm_dma_t d;
|
||||
|
||||
buf_priv->dma_type = I810_DMA_GENERAL;
|
||||
buf_priv->age = args->age;
|
||||
buf->used = args->used;
|
||||
|
||||
if (I810_VERBOSE)
|
||||
printk("i810DmaGeneral idx %d used %d\n", args->idx, buf->used);
|
||||
|
||||
d.context = DRM_KERNEL_CONTEXT;
|
||||
d.send_count = 1;
|
||||
d.send_indices = &buf->idx;
|
||||
d.send_sizes = &buf->used;
|
||||
d.flags = 0;
|
||||
d.request_count = 0;
|
||||
d.request_size = 0;
|
||||
d.request_indices = NULL;
|
||||
d.request_sizes = NULL;
|
||||
d.granted_count = 0;
|
||||
|
||||
atomic_inc(&dev_priv->pending_bufs);
|
||||
if((drm_dma_enqueue(dev, &d)) != 0)
|
||||
atomic_dec(&dev_priv->pending_bufs);
|
||||
i810_dma_schedule(dev, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int i810DmaVertex(drm_device_t *dev, drm_i810_vertex_t *args)
|
||||
{
|
||||
drm_device_dma_t *dma = dev->dma;
|
||||
drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private;
|
||||
drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
|
||||
drm_i810_buf_priv_t *buf_priv;
|
||||
drm_buf_t *buf;
|
||||
drm_dma_t d;
|
||||
|
||||
|
||||
buf = dma->buflist[ args->idx ];
|
||||
buf->used = args->real_used;
|
||||
|
||||
if (I810_VERBOSE)
|
||||
printk("i810DmaVertex idx %d used %d\n", args->idx, buf->used);
|
||||
|
||||
buf_priv = buf->dev_private;
|
||||
buf_priv->dma_type = I810_DMA_VERTEX;
|
||||
buf_priv->vertex_real_idx = args->real_idx;
|
||||
buf_priv->vertex_discard = args->discard;
|
||||
buf_priv->nbox = sarea_priv->nbox;
|
||||
buf_priv->age = args->age;
|
||||
|
||||
if (buf_priv->nbox >= I810_NR_SAREA_CLIPRECTS)
|
||||
buf_priv->nbox = I810_NR_SAREA_CLIPRECTS;
|
||||
|
||||
if (buf_priv->nbox)
|
||||
memcpy( buf_priv->boxes,
|
||||
sarea_priv->boxes,
|
||||
buf_priv->nbox * sizeof(xf86drmClipRectRec));
|
||||
|
||||
d.context = DRM_KERNEL_CONTEXT;
|
||||
d.send_count = 1;
|
||||
d.send_indices = &buf->idx;
|
||||
d.send_sizes = &buf->used;
|
||||
d.flags = 0;
|
||||
d.request_count = 0;
|
||||
d.request_size = 0;
|
||||
d.request_indices = NULL;
|
||||
d.request_sizes = NULL;
|
||||
d.granted_count = 0;
|
||||
|
||||
atomic_inc(&dev_priv->pending_bufs);
|
||||
if((drm_dma_enqueue(dev, &d)) != 0)
|
||||
atomic_dec(&dev_priv->pending_bufs);
|
||||
i810_dma_schedule(dev, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
int i810_dma_general(struct inode *inode, struct file *filp,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
drm_file_t *priv = filp->private_data;
|
||||
drm_device_t *dev = priv->dev;
|
||||
drm_i810_general_t general;
|
||||
int retcode = 0;
|
||||
|
||||
copy_from_user_ret(&general, (drm_i810_general_t *)arg, sizeof(general),
|
||||
-EFAULT);
|
||||
|
||||
if (I810_VERBOSE)
|
||||
printk("i810 dma general idx %d used %d\n",
|
||||
general.idx, general.used);
|
||||
|
||||
retcode = i810DmaGeneral(dev, &general);
|
||||
|
||||
return retcode;
|
||||
}
|
||||
|
||||
int i810_dma_vertex(struct inode *inode, struct file *filp,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
drm_file_t *priv = filp->private_data;
|
||||
drm_device_t *dev = priv->dev;
|
||||
drm_i810_vertex_t vertex;
|
||||
int retcode = 0;
|
||||
|
||||
copy_from_user_ret(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex),
|
||||
-EFAULT);
|
||||
|
||||
if (I810_VERBOSE)
|
||||
printk("i810 dma vertex, idx %d used %d"
|
||||
" real_idx %d discard %d\n",
|
||||
vertex.idx, vertex.real_used, vertex.real_idx,
|
||||
vertex.discard);
|
||||
|
||||
retcode = i810DmaVertex(dev, &vertex);
|
||||
|
||||
return retcode;
|
||||
|
||||
}
|
||||
|
||||
|
||||
int i810_dma(struct inode *inode, struct file *filp, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
drm_file_t *priv = filp->private_data;
|
||||
drm_device_t *dev = priv->dev;
|
||||
drm_device_dma_t *dma = dev->dma;
|
||||
int retcode = 0;
|
||||
drm_dma_t d;
|
||||
|
||||
copy_from_user_ret(&d, (drm_dma_t *)arg, sizeof(d), -EFAULT);
|
||||
DRM_DEBUG("%d %d: %d send, %d req\n",
|
||||
current->pid, d.context, d.send_count, d.request_count);
|
||||
|
||||
/* Per-context queues are unworkable if you are trying to do
|
||||
* state management from the client.
|
||||
*/
|
||||
d.context = DRM_KERNEL_CONTEXT;
|
||||
d.flags &= ~_DRM_DMA_WHILE_LOCKED;
|
||||
|
||||
/* Please don't send us buffers.
|
||||
*/
|
||||
if (d.send_count != 0) {
|
||||
DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",
|
||||
current->pid, d.send_count);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* We'll send you buffers.
|
||||
*/
|
||||
if (d.request_count < 0 || d.request_count > dma->buf_count) {
|
||||
DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
|
||||
current->pid, d.request_count, dma->buf_count);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
d.granted_count = 0;
|
||||
|
||||
if (!retcode && d.request_count) {
|
||||
retcode = drm_dma_get_buffers(dev, &d);
|
||||
}
|
||||
|
||||
copy_to_user_ret((drm_dma_t *)arg, &d, sizeof(d), -EFAULT);
|
||||
|
||||
return retcode;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -194,51 +194,11 @@ int i810_rmctx(struct inode *inode, struct file *filp, unsigned int cmd,
|
|||
drm_file_t *priv = filp->private_data;
|
||||
drm_device_t *dev = priv->dev;
|
||||
drm_ctx_t ctx;
|
||||
drm_queue_t *q;
|
||||
drm_buf_t *buf;
|
||||
|
||||
copy_from_user_ret(&ctx, (drm_ctx_t *)arg, sizeof(ctx), -EFAULT);
|
||||
printk("%d\n", ctx.handle);
|
||||
if(ctx.handle == DRM_KERNEL_CONTEXT) {
|
||||
q = dev->queuelist[ctx.handle];
|
||||
atomic_inc(&q->use_count);
|
||||
if (atomic_read(&q->use_count) == 1) {
|
||||
/* No longer in use */
|
||||
atomic_dec(&q->use_count);
|
||||
return -EINVAL;
|
||||
}
|
||||
atomic_inc(&q->finalization); /* Mark queue in finalization state */
|
||||
atomic_sub(2, &q->use_count);
|
||||
/* Mark queue as unused (pending finalization) */
|
||||
|
||||
while (test_and_set_bit(0, &dev->interrupt_flag)) {
|
||||
printk("Calling schedule from rmctx\n");
|
||||
schedule();
|
||||
if (signal_pending(current)) {
|
||||
clear_bit(0, &dev->interrupt_flag);
|
||||
return -EINTR;
|
||||
}
|
||||
}
|
||||
|
||||
/* Remove queued buffers */
|
||||
while ((buf = drm_waitlist_get(&q->waitlist))) {
|
||||
drm_free_buffer(dev, buf);
|
||||
}
|
||||
clear_bit(0, &dev->interrupt_flag);
|
||||
|
||||
/* Wakeup blocked processes */
|
||||
wake_up_interruptible(&q->read_queue);
|
||||
wake_up_interruptible(&q->write_queue);
|
||||
wake_up_interruptible(&q->flush_queue);
|
||||
|
||||
/* Finalization over. Queue is made
|
||||
available when both use_count and
|
||||
finalization become 0, which won't
|
||||
happen until all the waiting processes
|
||||
stop waiting. */
|
||||
atomic_dec(&q->finalization);
|
||||
} else {
|
||||
drm_ctxbitmap_free(dev, ctx.handle);
|
||||
if(ctx.handle != DRM_KERNEL_CONTEXT) {
|
||||
drm_ctxbitmap_free(dev, ctx.handle);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
851
linux/i810_dma.c
851
linux/i810_dma.c
File diff suppressed because it is too large
Load diff
|
|
@ -40,10 +40,10 @@
|
|||
* 'vertex_dma' ioctl.
|
||||
*/
|
||||
typedef struct {
|
||||
int dma_type;
|
||||
int age;
|
||||
int vertex_real_idx;
|
||||
int vertex_discard;
|
||||
u32 *in_use;
|
||||
int my_use_idx;
|
||||
unsigned int nbox;
|
||||
xf86drmClipRectRec boxes[I810_NR_SAREA_CLIPRECTS];
|
||||
} drm_i810_buf_priv_t;
|
||||
|
|
@ -53,8 +53,6 @@ typedef struct {
|
|||
#define I810_DMA_VERTEX 1
|
||||
#define I810_DMA_DISCARD 2 /* not used */
|
||||
|
||||
|
||||
|
||||
#define I810_VERBOSE 0
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -53,27 +53,22 @@ typedef struct _xf86drmClipRectRec {
|
|||
unsigned short y2;
|
||||
} xf86drmClipRectRec;
|
||||
|
||||
|
||||
/* Might one day want to support the client-side ringbuffer code again.
|
||||
*/
|
||||
|
||||
#define I810_USE_BATCH 1
|
||||
|
||||
/* 32 16k dma buffers -- 512k
|
||||
*/
|
||||
#define I810_DMA_BUF_ORDER 14
|
||||
#define I810_DMA_BUF_SZ (1<<I810_DMA_BUF_ORDER)
|
||||
#define I810_DMA_BUF_NR 32
|
||||
|
||||
#define I810_NR_SAREA_CLIPRECTS 2
|
||||
|
||||
|
||||
/* Each region is a minimum of 64k, and there are at most 128 of them.
|
||||
*/
|
||||
#define I810_NR_TEX_REGIONS 128
|
||||
#define I810_LOG_MIN_TEX_REGION_SIZE 16
|
||||
|
||||
|
||||
|
||||
typedef struct {
|
||||
unsigned char next, prev; /* indices to form a circular LRU */
|
||||
unsigned char in_use; /* owned by a client, or free? */
|
||||
|
|
@ -99,22 +94,21 @@ typedef struct {
|
|||
* else's - simply eject them all in LRU order.
|
||||
*/
|
||||
i810TexRegion texList[I810_NR_TEX_REGIONS+1]; /* Last elt is sentinal */
|
||||
|
||||
int texAge; /* last time texture was uploaded */
|
||||
|
||||
int last_enqueue; /* last time a buffer was enqueued */
|
||||
int last_dispatch; /* age of the most recently dispatched buffer */
|
||||
int last_quiescent; /* */
|
||||
|
||||
int ctxOwner; /* last 3d context to hold lock */
|
||||
|
||||
|
||||
int ctxOwner; /* last context to upload state */
|
||||
} drm_i810_sarea_t;
|
||||
|
||||
|
||||
typedef struct {
|
||||
int idx;
|
||||
int used;
|
||||
int age;
|
||||
int age;
|
||||
} drm_i810_general_t;
|
||||
|
||||
|
||||
|
|
@ -139,5 +133,5 @@ typedef struct {
|
|||
#define DRM_IOCTL_I810_INIT DRM_IOW( 0x40, drm_i810_init_t)
|
||||
#define DRM_IOCTL_I810_VERTEX DRM_IOW( 0x41, drm_i810_vertex_t)
|
||||
#define DRM_IOCTL_I810_DMA DRM_IOW( 0x42, drm_i810_general_t)
|
||||
#define DRM_IOCTL_I810_FLUSH DRM_IO ( 0x43 )
|
||||
#define DRM_IOCTL_I810_FLUSH DRM_IO ( 0x43)
|
||||
#endif /* _I810_DRM_H_ */
|
||||
|
|
|
|||
|
|
@ -585,24 +585,82 @@ int i810_release(struct inode *inode, struct file *filp)
|
|||
drm_device_t *dev = priv->dev;
|
||||
int retcode = 0;
|
||||
|
||||
DRM_DEBUG("open_count = %d\n", dev->open_count);
|
||||
if (!(retcode = drm_release(inode, filp))) {
|
||||
MOD_DEC_USE_COUNT;
|
||||
atomic_inc(&dev->total_close);
|
||||
spin_lock(&dev->count_lock);
|
||||
if (!--dev->open_count) {
|
||||
if (atomic_read(&dev->ioctl_count) || dev->blocked) {
|
||||
DRM_ERROR("Device busy: %d %d\n",
|
||||
atomic_read(&dev->ioctl_count),
|
||||
dev->blocked);
|
||||
spin_unlock(&dev->count_lock);
|
||||
return -EBUSY;
|
||||
DRM_DEBUG("pid = %d, device = 0x%x, open_count = %d\n",
|
||||
current->pid, dev->device, dev->open_count);
|
||||
|
||||
if (_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)
|
||||
&& dev->lock.pid == current->pid) {
|
||||
i810_reclaim_buffers(dev, priv->pid);
|
||||
DRM_ERROR("Process %d dead, freeing lock for context %d\n",
|
||||
current->pid,
|
||||
_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
|
||||
drm_lock_free(dev,
|
||||
&dev->lock.hw_lock->lock,
|
||||
_DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
|
||||
|
||||
/* FIXME: may require heavy-handed reset of
|
||||
hardware at this point, possibly
|
||||
processed via a callback to the X
|
||||
server. */
|
||||
} else {
|
||||
/* The lock is required to reclaim buffers */
|
||||
DECLARE_WAITQUEUE(entry, current);
|
||||
add_wait_queue(&dev->lock.lock_queue, &entry);
|
||||
for (;;) {
|
||||
if (!dev->lock.hw_lock) {
|
||||
/* Device has been unregistered */
|
||||
retcode = -EINTR;
|
||||
break;
|
||||
}
|
||||
if (drm_lock_take(&dev->lock.hw_lock->lock,
|
||||
DRM_KERNEL_CONTEXT)) {
|
||||
dev->lock.pid = priv->pid;
|
||||
dev->lock.lock_time = jiffies;
|
||||
atomic_inc(&dev->total_locks);
|
||||
break; /* Got lock */
|
||||
}
|
||||
/* Contention */
|
||||
atomic_inc(&dev->total_sleeps);
|
||||
current->state = TASK_INTERRUPTIBLE;
|
||||
schedule();
|
||||
if (signal_pending(current)) {
|
||||
retcode = -ERESTARTSYS;
|
||||
break;
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
return i810_takedown(dev);
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
current->state = TASK_RUNNING;
|
||||
remove_wait_queue(&dev->lock.lock_queue, &entry);
|
||||
if(!retcode) {
|
||||
i810_reclaim_buffers(dev, priv->pid);
|
||||
drm_lock_free(dev, &dev->lock.hw_lock->lock,
|
||||
DRM_KERNEL_CONTEXT);
|
||||
}
|
||||
}
|
||||
drm_fasync(-1, filp, 0);
|
||||
|
||||
down(&dev->struct_sem);
|
||||
if (priv->prev) priv->prev->next = priv->next;
|
||||
else dev->file_first = priv->next;
|
||||
if (priv->next) priv->next->prev = priv->prev;
|
||||
else dev->file_last = priv->prev;
|
||||
up(&dev->struct_sem);
|
||||
|
||||
drm_free(priv, sizeof(*priv), DRM_MEM_FILES);
|
||||
MOD_DEC_USE_COUNT;
|
||||
atomic_inc(&dev->total_close);
|
||||
spin_lock(&dev->count_lock);
|
||||
if (!--dev->open_count) {
|
||||
if (atomic_read(&dev->ioctl_count) || dev->blocked) {
|
||||
DRM_ERROR("Device busy: %d %d\n",
|
||||
atomic_read(&dev->ioctl_count),
|
||||
dev->blocked);
|
||||
spin_unlock(&dev->count_lock);
|
||||
return -EBUSY;
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
return i810_takedown(dev);
|
||||
}
|
||||
spin_unlock(&dev->count_lock);
|
||||
return retcode;
|
||||
}
|
||||
|
||||
|
|
@ -667,8 +725,7 @@ int i810_unlock(struct inode *inode, struct file *filp, unsigned int cmd,
|
|||
atomic_inc(&dev->total_unlocks);
|
||||
if (_DRM_LOCK_IS_CONT(dev->lock.hw_lock->lock))
|
||||
atomic_inc(&dev->total_contends);
|
||||
drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
|
||||
i810_dma_schedule(dev, 1);
|
||||
drm_lock_transfer(dev, &dev->lock.hw_lock->lock, DRM_KERNEL_CONTEXT);
|
||||
if (!dev->context_flag) {
|
||||
if (drm_lock_free(dev, &dev->lock.hw_lock->lock,
|
||||
DRM_KERNEL_CONTEXT)) {
|
||||
|
|
|
|||
|
|
@ -54,10 +54,8 @@ typedef struct drm_i810_private {
|
|||
unsigned long hw_status_page;
|
||||
unsigned long counter;
|
||||
|
||||
atomic_t dispatch_lock;
|
||||
atomic_t pending_bufs;
|
||||
atomic_t in_flush;
|
||||
|
||||
atomic_t flush_done;
|
||||
wait_queue_head_t flush_queue; /* Processes waiting until flush */
|
||||
} drm_i810_private_t;
|
||||
|
||||
/* i810_drv.c */
|
||||
|
|
@ -86,6 +84,8 @@ extern int i810_dma_init(struct inode *inode, struct file *filp,
|
|||
unsigned int cmd, unsigned long arg);
|
||||
extern int i810_flush_ioctl(struct inode *inode, struct file *filp,
|
||||
unsigned int cmd, unsigned long arg);
|
||||
extern void i810_reclaim_buffers(drm_device_t *dev, pid_t pid);
|
||||
|
||||
|
||||
/* i810_bufs.c */
|
||||
extern int i810_addbufs(struct inode *inode, struct file *filp,
|
||||
|
|
|
|||
|
|
@ -1419,6 +1419,7 @@ int mga_flush_queue(drm_device_t *dev)
|
|||
atomic_read(&dev_priv->pending_bufs));
|
||||
mga_dma_schedule(dev, 0);
|
||||
schedule_timeout((HZ/60));
|
||||
atomic_inc(&dev->total_sleeps);
|
||||
if (signal_pending(current)) {
|
||||
ret = -EINTR; /* Can't restart */
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue