summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-02-19 12:06:27 +0000
committerDave Airlie <airlied@linux.ie>2006-02-19 12:06:27 +0000
commit4c1c05ad96bd174d82ab94da7a0645bc448442f6 (patch)
tree9c266a541ab4593b28869a0cf5571daa81f62e1a /shared-core
parenta25667894a8b8cab1dc8a48994cd9a61ecaba152 (diff)
missed a piece of benh patch
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/r300_cmdbuf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
index b4bbe99b..9af5c073 100644
--- a/shared-core/r300_cmdbuf.c
+++ b/shared-core/r300_cmdbuf.c
@@ -251,11 +251,11 @@ static __inline__ int r300_check_offset(drm_radeon_private_t *dev_priv,
but this value is not being kept.
This code is correct for now (does the same thing as the
code that sets MC_FB_LOCATION) in radeon_cp.c */
- if ((offset >= dev_priv->fb_location) &&
- (offset < dev_priv->gart_vm_start))
+ if (offset >= dev_priv->fb_location &&
+ offset < (dev_priv->fb_location + dev_priv->fb_size))
return 0;
- if ((offset >= dev_priv->gart_vm_start) &&
- (offset < dev_priv->gart_vm_start + dev_priv->gart_size))
+ if (offset >= dev_priv->gart_vm_start &&
+ offset < (dev_priv->gart_vm_start + dev_priv->gart_size))
return 0;
return 1;
}