From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel =?ISO-8859-1?Q?D=E4nzer?= Date: Tue, 21 Dec 2010 07:29:03 +0000 Subject: Re: [PATCH 1/3] fb: fix overlapping test off-by-one. Message-Id: <1292916543.19556.46.camel@thor.local> List-Id: References: <1292895677-4242-1-git-send-email-airlied@gmail.com> <1292895677-4242-2-git-send-email-airlied@gmail.com> In-Reply-To: <1292895677-4242-2-git-send-email-airlied@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Dave Airlie Cc: linux-fbdev@vger.kernel.org, Dave Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.sf.net 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 -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753695Ab0LUH3X (ORCPT ); Tue, 21 Dec 2010 02:29:23 -0500 Received: from darkcity.gna.ch ([195.226.6.51]:56460 "EHLO mail.gna.ch" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753051Ab0LUH3V convert rfc822-to-8bit (ORCPT ); Tue, 21 Dec 2010 02:29:21 -0500 X-Amavis-Alert: BAD HEADER SECTION, Improper folded header field made up entirely of whitespace (char 09 hex): Face: ...MWASAkVVViQjzP\n jycPrvgA\n\t\n R1goSzOnkp14Y[...] Subject: Re: [PATCH 1/3] fb: fix overlapping test off-by-one. From: Michel =?ISO-8859-1?Q?D=E4nzer?= To: Dave Airlie Cc: linux-fbdev@vger.kernel.org, Dave Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.sf.net In-Reply-To: <1292895677-4242-2-git-send-email-airlied@gmail.com> References: <1292895677-4242-1-git-send-email-airlied@gmail.com> <1292895677-4242-2-git-send-email-airlied@gmail.com> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAADBQTFRFDg4OHh4eLCwsOzs7S0tLWlpaa2treXl5hISEjY2NmJiYqKiotLS0xsbG1dXV/Pz81CO0SQAAArtJREFUOMtd1M9P01AcAHCI/4AtGq/QDfDHRfraEX8eaNeJFw1rO/DCYet7mxc1ZG0x3sStHQkmZpqtHDwAi+tMiFEzbZdwNWEJR48cjPG4g5HhELUbrHvjpYe2n7zvt++977cD/7rjsCry8uNG93Gge9OKUyAAgLB1AlpTZICmAzR15QTEiQAPAKADYLMPfhNnEJR4HvD0tT5YI2KGUcyqihQN7mDwZ3hMN4q2N4ol+gEGTSLWhorrjYXrGPwc0jTDOoKP4xi8G0W6adl2Gz6zGDwag5p5PMON7vZgJuSB976+3U6y2QdeKNet1+uum9/qwVQHvEjtKesY0EIb7CNYe+7DIRXCID/vQ4tksVAY7JFBD7yvqrWTL93xoUmOQsPIddbnuk8v+bBPsigB2KRlFxS4nL/owwEpKBSg2MU3UcDf+nATyyHEQwrHzJZFNpXeuOHDC0qW4sMhEHESFGOUrvgQpWUYFVNQdjQxca8abnSB55CmehdcLSxa1ifoQ4JBpmGYWbhsly3X0fxQ7xmkW3Y5CztLcXI+fAu2oWho3nbV6s5rH35xSC/aBR2tOpVa/Utv25tcTDPL6aT21kG17WrvaFtMBJmFhJCsVF4uu9VG76DWBaRnEiNs7pU659pYlfwtQSRy9GCYlwR7C6/dPQgBw3MsTPNWA4d9SeMDDC9JYdnqq/amdF+diGnVhXFztQ/2lJSWjulOxjRX+uC7EkOqhLRk2ejrqHVBEqCqJLO5cmEXgx8TrBiWVQh1u2DhzQlPsyIveU2YLGorGBxODoR5notlpcUieoLB1/NEmGc4AalGJpLe8WF/8txMWASAkVVViQjzP jycPrvgA R1goSzOnkp14YCYHsp7QJHAS5QcXDqG1jBxdSITVgBNkBTFloj88Q/gMkFcuItYiQPUCBGc2xh5drsD/wGZrgsgDOE4ZAAAAABJRU5ErkJggg== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Date: Tue, 21 Dec 2010 08:29:03 +0100 Message-ID: <1292916543.19556.46.camel@thor.local> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer