[PATCH] drm/nouveau: fix WITHIN macro off by one

[PATCH] drm/nouveau: fix WITHIN macro off by one

[Pekka Paalanen]

Equality in x <= y + z is already out of range. X must be stricly less.

Signed-off-by: Pekka Paalanen <pq-X3B1VOXEql0@public.gmane.org>
---
 drivers/gpu/drm/nouveau/nouveau_bios.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 6afd82e..539835a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -300,7 +300,7 @@ valid_reg(struct nvbios *bios, uint32_t reg)
 	if (dev_priv->card_type >= NV_50)
 		return 1;
 
-	#define WITHIN(x, y, z) ((x >= y) && (x <= y + z))
+	#define WITHIN(x, y, z) ((x >= y) && (x < y + z))
 	if (WITHIN(reg, NV_PMC_OFFSET, NV_PMC_SIZE))
 		return 1;
 	if (WITHIN(reg, NV_PBUS_OFFSET, NV_PBUS_SIZE))
-- 
1.6.3.3

Re: [PATCH] drm/nouveau: fix WITHIN macro off by one

[Stephane Marchesin]

On Fri, Sep 18, 2009 at 20:15, Pekka Paalanen <pq-X3B1VOXEql0@public.gmane.org> wrote:
> Equality in x <= y + z is already out of range. X must be stricly less.
>

Yeah, I did that back when the SIZE defines were, say, 0x1fff instead
of 0x2000 so this was required. Seems like the size defines changed,
but the WITHIN macro wasn't updated.

Stephane

Re: [PATCH] drm/nouveau: fix WITHIN macro off by one

[Pekka Paalanen]

On Sun, 20 Sep 2009 13:29:24 +0200
Stephane Marchesin <marchesin-YynmYXH4S6491FlJP1ih0VAUjnlXr6A1@public.gmane.org> wrote:

> On Fri, Sep 18, 2009 at 20:15, Pekka Paalanen <pq-X3B1VOXEql0@public.gmane.org> wrote:
> > Equality in x <= y + z is already out of range. X must be
> > stricly less.
> >
> 
> Yeah, I did that back when the SIZE defines were, say, 0x1fff
> instead of 0x2000 so this was required. Seems like the size
> defines changed, but the WITHIN macro wasn't updated.

Thanks for confirming this, I pushed it a while back.

-- 
Pekka Paalanen
http://www.iki.fi/pq/