From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753281Ab0LXDaJ (ORCPT ); Thu, 23 Dec 2010 22:30:09 -0500 Received: from 124x34x33x190.ap124.ftth.ucom.ne.jp ([124.34.33.190]:42587 "EHLO master.linux-sh.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753200Ab0LXDaH (ORCPT ); Thu, 23 Dec 2010 22:30:07 -0500 Date: Fri, 24 Dec 2010 12:28:31 +0900 From: Paul Mundt To: Michel D?nzer Cc: Dave Airlie , linux-fbdev@vger.kernel.org, Dave Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.sf.net Subject: Re: [PATCH 1/3] fb: fix overlapping test off-by-one. Message-ID: <20101224032831.GI28151@linux-sh.org> References: <1292895677-4242-1-git-send-email-airlied@gmail.com> <1292895677-4242-2-git-send-email-airlied@gmail.com> <1292916543.19556.46.camel@thor.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1292916543.19556.46.camel@thor.local> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 21, 2010 at 08:29:03AM +0100, Michel D?nzer wrote: > On Die, 2010-12-21 at 11:41 +1000, Dave Airlie wrote: > > From: Dave Airlie > > > > On my system with a radeon x2, the first GPU was not overlapping vesa > > but the test decided it was. > > > > Signed-off-by: Dave Airlie > > --- > > drivers/video/fbmem.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c > > index 0e6aa3d..4ac1201 100644 > > --- a/drivers/video/fbmem.c > > +++ b/drivers/video/fbmem.c > > @@ -1458,7 +1458,7 @@ static bool apertures_overlap(struct aperture *gen, struct aperture *hw) > > if (gen->base == hw->base) > > return true; > > /* is the generic aperture base inside the hw base->hw base+size */ > > - if (gen->base > hw->base && gen->base <= hw->base + hw->size) > > + if (gen->base > hw->base && gen->base < hw->base + hw->size) > > Good catch. > > Reviewed-by: Michel D??nzer > I'll queue this for .37, thanks.