Re: 2.6.11-rc2-mm1

From: Dave Jones
Date: Tue Jan 25 2005 - 15:34:27 EST


On Tue, Jan 25, 2005 at 08:58:31PM +0100, Brice Goglin wrote:
> Dave Jones a écrit :
> >This is needed too on top of -mm1.
> >
> >diff -Nru a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
> >--- a/drivers/char/agp/generic.c 2005-01-25 14:34:24 -05:00
> >+++ b/drivers/char/agp/generic.c 2005-01-25 14:34:24 -05:00
> >@@ -324,9 +324,9 @@
> > info->chipset = agp_bridge->type;
> > info->device = agp_bridge->dev;
> > if (check_bridge_mode(agp_bridge->dev))
> >- info->mode = agp_bridge->mode & AGP3_RESERVED_MASK;
> >+ info->mode = agp_bridge->mode & ~AGP3_RESERVED_MASK;
> > else
> >- info->mode = agp_bridge->mode & AGP2_RESERVED_MASK;
> >+ info->mode = agp_bridge->mode & ~AGP2_RESERVED_MASK;
> > info->aper_base = agp_bridge->gart_bus_addr;
> > info->aper_size = agp_return_size();
> > info->max_memory = agp_bridge->max_memory_agp;
> >
>
> Maybe that's not important, but on top of my -rc2-mm1, your patch looks
> like the one I attached to this mail.

Doh, yes. Your variant is needed with the multi-gart patches that
are in -mm. The one I posted is what I just committed to agpgart-bk

Dave

-
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/