Re: [PATCH 1/3] fb: fix overlapping test off-by-one.

2010-12-23 Thread Paul Mundt
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 airl...@redhat.com
  
  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 airl...@redhat.com
  ---
   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 mic...@daenzer.net
 
I'll queue this for .37, thanks.

--
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel


[PATCH 1/3] fb: fix overlapping test off-by-one.

2010-12-20 Thread Dave Airlie
From: Dave Airlie airl...@redhat.com

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 airl...@redhat.com
---
 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)
return true;
return false;
 }
-- 
1.7.1


--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [PATCH 1/3] fb: fix overlapping test off-by-one.

2010-12-20 Thread Michel Dänzer
On Die, 2010-12-21 at 11:41 +1000, Dave Airlie wrote: 
 From: Dave Airlie airl...@redhat.com
 
 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 airl...@redhat.com
 ---
  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 mic...@daenzer.net


-- 
Earthling Michel Dänzer   |http://www.vmware.com
Libre software enthusiast |  Debian, X and DRI developer

--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel