Re: Prospects of DRM TTM making it into 2.6.24?

[Andrew Morton]

On Wed, 21 Nov 2007 17:36:33 +1000 "Dave Airlie" <airlied@xxxxxxxxx> wrote:

> > >
> > > I also have a few AGP changes I need to line up to support the chipset
> > > flushing work I've done to support TTM properly..
> > >
> >
> > Did anything happen with that null-pointer deref I was hitting?
> >
> 
> I've rebased the patches in my tree along with a chunk I missed which
> should make your patch unnecessary.

ok..

> Do you pull my agp-mm tree into -mm?
> 
> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 agp-mm
> if not..

I pull
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-mm
and
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-mm

the agp tree was empty when I last pulled it, ~12 hours ago.

<looks>

There's stuff there now:

GIT d9b38a24bdbeeb38c03de7172a30769333452d10 git+ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-mm

commit d9b38a24bdbeeb38c03de7172a30769333452d10
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date:   Wed Nov 21 16:36:31 2007 +1000

    agp/intel: Add chipset flushing support for i8xx chipsets.
    
    This is a bit of a large hammer but it makes sure the chipset is flushed
    by writing out 1k of data to an uncached page. We may be able to get better
    information in the future on how to this better.
    
    Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>

commit f5b8bc5801bc9676935cb7d2417a636a08e2e06d
Author: Dave Airlie <airlied@xxxxxxxx>
Date:   Mon Oct 29 18:06:10 2007 +1000

    intel-agp: add chipset flushing support
    
    This adds support for flushing the chipsets on the 915, 945, 965 and G33
    families of Intel chips.
    
    The BIOS doesn't seem to always allocate the BAR on the 965 chipsets
    so I have to use pci resource code to create a resource
    
    It adds an export for pcibios_align_resource.

commit 5beaa1edf58ef2a477049f21842a8f12f28b8366
Author: Dave Airlie <airlied@xxxxxxxx>
Date:   Mon Oct 29 15:14:03 2007 +1000

    agp: add chipset flushing support to AGP interface
    
    This bumps the AGP interface to 0.103.
    
    Certain Intel chipsets contains a global write buffer, and this can require
    flushing from the drm or X.org to make sure all data has hit RAM before
    initiating a GPU transfer, due to a lack of coherency with the integrated
    graphics device and this buffer.
    
    This just adds generic support to the AGP interfaces, a follow-on patch
    will add support to the Intel driver to use this interface.
    
    Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
 arch/x86/pci/i386.c             |    2 +-
 drivers/char/agp/agp.h          |    3 +-
 drivers/char/agp/backend.c      |    2 +-
 drivers/char/agp/compat_ioctl.c |    4 +
 drivers/char/agp/compat_ioctl.h |    2 +
 drivers/char/agp/frontend.c     |   11 +++
 drivers/char/agp/generic.c      |    7 ++
 drivers/char/agp/intel-agp.c    |  150 +++++++++++++++++++++++++++++++++++++++
 include/linux/agp_backend.h     |    1 +
 include/linux/agpgart.h         |    1 +
 10 files changed, 180 insertions(+), 3 deletions(-)


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/