mesa: Changes to 'master'

[Dave Airlie]

 src/mesa/drivers/dri/Makefile.template        |    1 
 src/mesa/drivers/dri/common/dri_bufmgr.c      |   28 
 src/mesa/drivers/dri/common/dri_bufmgr.h      |   40 -
 src/mesa/drivers/dri/common/dri_bufmgr_fake.c |  136 ++++
 src/mesa/drivers/dri/common/dri_bufmgr_ttm.c  |  469 --------------
 src/mesa/drivers/dri/i915/Makefile            |    3 
 src/mesa/drivers/dri/i915/intel_batchbuffer.c |  128 ---
 src/mesa/drivers/dri/i915/intel_batchbuffer.h |   15 
 src/mesa/drivers/dri/i915/intel_bufmgr_ttm.c  |  853 ++++++++++++++++++++++++++
 src/mesa/drivers/dri/i915/intel_bufmgr_ttm.h  |   17 
 src/mesa/drivers/dri/i915/intel_ioctl.c       |   58 +
 src/mesa/drivers/dri/i915/intel_ioctl.h       |    4 
 src/mesa/drivers/dri/i915/intel_regions.c     |    4 
 src/mesa/drivers/dri/i915/intel_screen.c      |   12 
 14 files changed, 1127 insertions(+), 641 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit bf805d3bf5bf191aa669b6155316a78917cf9b0e
Merge: 9e06cf0... 72c8888...
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 12 11:02:46 2007 +1000

    Merge branch 'master' into i915-superioctl

commit 9e06cf00cfb24528653913fc90eded4d370c1149
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 12 11:01:17 2007 +1000

    i915: only enable TTM path if drm minor is > 11 for superioctl

commit ea2278bc793670d4b7922131d1638f2446c896e0
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 12 10:59:38 2007 +1000

    dri: remove ttm common code since superioctl is device specific

commit 7fc5c0307af98e1a0ff7e9081b07f940d1e3f916
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 12 10:56:25 2007 +1000

    i915: fixup reloc header defines

commit 8909f1131ab4d9d117d79aee617eceabf3ea60c8
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 9 14:36:04 2007 +1000

    i915: workout max relocs from batch buffer size

commit 7e83c15fa01c04c12b7aab9dd2e7ab0ae193b1c3
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 9 12:18:50 2007 +1000

    i915: fixup up bufmgr to pass num buffers to kernel
    
    remove unneeded entry points

commit 0ba57d02cd4a9e37bb5367a5c345c5f41038eb27
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 5 14:41:32 2007 +1000

    i915: drop complex list handling for now
    
    If this proves a win later we can add it back but at the moment
    I don't think it's required yet

commit 4611b9398e6164ea419bf587e759a354be4c58b4
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 5 14:33:18 2007 +1000

    i915: clean up lists on teardown
    
    also fix a use of uninitialised pointer

commit 4e1c76de0bf767857737116a0ec908cb8d35083e
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 5 12:15:50 2007 +1000

    i915: add copyrights to new files

commit 8e21bb516f87bfdde90d0f469ede4192435b9235
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct 5 12:12:33 2007 +1000

    i915: increase batchbuffer back to 16k

commit c4a9a708884c2f790e04aaaa4a4cb2993ff33089
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Oct 4 15:31:47 2007 +1000

    i915: add superioctl support to the ttm codepaths.
    
    gears now runs for about 10-15 seconds with some artifacts before falling
    over.

commit fa031c8914d685e153b4ab886f43fdbfbbd0a30b
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Oct 3 16:54:59 2007 +1000

    i915: add superioctl initial support inside bufmgr ttm

commit 4cd3ef58a989f61ff22669648e4117426c6e603c
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Oct 3 15:50:46 2007 +1000

    i915/drmbuf: attempt to push relocations into buffer manager
    
    This moves the relocations into the buffer manager in prepration for
    a superioctl move.