Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262115AbVAYUal (ORCPT ); Tue, 25 Jan 2005 15:30:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262116AbVAYUaE (ORCPT ); Tue, 25 Jan 2005 15:30:04 -0500 Received: from mx1.redhat.com ([66.187.233.31]:59042 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S262115AbVAYU3m (ORCPT ); Tue, 25 Jan 2005 15:29:42 -0500 Date: Tue, 25 Jan 2005 15:29:37 -0500 From: Dave Jones To: Brice.Goglin@ens-lyon.org Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: 2.6.11-rc2-mm1 Message-ID: <20050125202937.GD9267@redhat.com> Mail-Followup-To: Dave Jones , Brice.Goglin@ens-lyon.org, Andrew Morton , linux-kernel@vger.kernel.org References: <20050124021516.5d1ee686.akpm@osdl.org> <41F4E28A.3090305@ens-lyon.fr> <20050124185258.GB27570@redhat.com> <20050124204458.GD27570@redhat.com> <41F56949.3010505@ens-lyon.fr> <20050125193822.GC9267@redhat.com> <41F6A4E7.6090105@ens-lyon.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <41F6A4E7.6090105@ens-lyon.fr> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1389 Lines: 34 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/