diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2000-02-23 01:10:21 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2000-02-23 01:10:21 +0000 |
commit | a6d1e3d88e58d3e9265b42e62503b258e7b66f41 (patch) | |
tree | c490c239a6c7354d8d7cfe5b8932dbe62c643266 | |
parent | 1cb658e20d26eaf06f6483b98ffd5dcbc1708362 (diff) |
fixed last_enqueue
-rw-r--r-- | linux/Makefile.linux | 302 | ||||
-rw-r--r-- | linux/mga_dma.c | 12 | ||||
-rw-r--r-- | linux/mga_drm_public.h | 11 |
3 files changed, 315 insertions, 10 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index f740220f..50cb7a86 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -155,3 +155,305 @@ $(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_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_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_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: /usr/include/linux/interrupt.h /usr/include/linux/kernel.h +mga_dma.o: /usr/include/asm/bitops.h /usr/include/asm/atomic.h +mga_dma.o: /usr/include/asm/hardirq.h /usr/include/linux/threads.h +mga_dma.o: /usr/include/asm/softirq.h +mga_dma.o: mga_drm_public.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 drm.h +mga_state.o: /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 diff --git a/linux/mga_dma.c b/linux/mga_dma.c index f5e06775..d1827195 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -191,6 +191,9 @@ unsigned int mga_create_sync_tag(drm_device_t *dev) /* Do a full dma flush */ } temp = dev_priv->sync_tag << 2; + + dev_priv->sarea_priv->last_enqueue = temp; + DRM_DEBUG("sync_tag : %x\n", temp); return temp; } @@ -209,7 +212,7 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) for (i = 0; i < dma->buf_count; i++) { drm_buf_t *buf = dma->buflist[ i ]; drm_mga_buf_priv_t *buf_priv = buf->dev_private; - if(buf_priv->age < status[1]) { + if (buf_priv->age < status[1]) { buf_priv->age = MGA_BUF_USED; return buf; } @@ -471,6 +474,8 @@ static void mga_dma_service(int irq, void *device, struct pt_regs *regs) drm_mga_prim_buf_t *last_prim_buffer; int softrap_idx; int next_idx; + __volatile__ unsigned int *status = + (__volatile__ unsigned int *)dev_priv->status_page; softrap_idx = MGA_READ(MGAREG_SECADDRESS); atomic_inc(&dev->total_irq); @@ -490,6 +495,9 @@ static void mga_dma_service(int irq, void *device, struct pt_regs *regs) clear_bit(0, &last_prim_buffer->swap_pending); clear_bit(0, &dev_priv->dispatch_lock); atomic_dec(&dev_priv->pending_bufs); + + dev_priv->sarea_priv->last_dispatch = status[1]; + queue_task(&dev->tq, &tq_immediate); mark_bh(IMMEDIATE_BH); } @@ -859,7 +867,6 @@ int mga_lock(struct inode *inode, struct file *filp, unsigned int cmd, { drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; - drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; DECLARE_WAITQUEUE(entry, current); int ret = 0; drm_lock_t lock; @@ -943,7 +950,6 @@ int mga_flush_ioctl(struct inode *inode, struct file *filp, { drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; - drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; drm_device_dma_t *dma = dev->dma; diff --git a/linux/mga_drm_public.h b/linux/mga_drm_public.h index 534c7e4d..fcc97db0 100644 --- a/linux/mga_drm_public.h +++ b/linux/mga_drm_public.h @@ -177,7 +177,7 @@ typedef struct _xf86drmClipRectRec { #define MGA_CARD_HEAP 0 #define MGA_AGP_HEAP 1 #define MGA_NR_TEX_HEAPS 2 -#define MGA_NR_TEX_REGIONS 128 +#define MGA_NR_TEX_REGIONS 16 #define MGA_LOG_MIN_TEX_REGION_SIZE 16 typedef struct { @@ -199,7 +199,6 @@ typedef struct unsigned int WarpPipe; unsigned int dirty; - unsigned int nbox; xf86drmClipRectRec boxes[MGA_NR_SAREA_CLIPRECTS]; @@ -222,6 +221,7 @@ typedef struct unsigned int exported_nback; int exported_back_x, exported_front_x, exported_w; int exported_back_y, exported_front_y, exported_h; + xf86drmClipRectRec exported_boxes[MGA_NR_SAREA_CLIPRECTS]; /* Counters for aging textures and for client-side throttling. */ @@ -239,6 +239,7 @@ typedef struct */ int ctxOwner; + } drm_mga_sarea_t; @@ -249,13 +250,11 @@ typedef struct { int clear_color; int clear_depth; int flags; - int age; } drm_mga_clear_t; typedef struct { int idx; - int age; } drm_mga_swap_t; typedef struct { @@ -264,7 +263,6 @@ typedef struct { unsigned int pitch; xf86drmClipRectRec texture; int idx; - int age; } drm_mga_iload_t; @@ -280,8 +278,7 @@ typedef struct { int idx; /* buffer to queue and free on completion */ int real_idx; /* buffer to execute */ int real_used; /* buf->used in for real buffer */ - int age; - int discard; + int discard; /* */ } drm_mga_vertex_t; |