missed a piece of benh patch
authorDave Airlie <airlied@linux.ie>
Sun, 19 Feb 2006 12:06:27 +0000 (12:06 +0000)
committerDave Airlie <airlied@linux.ie>
Sun, 19 Feb 2006 12:06:27 +0000 (12:06 +0000)
shared-core/r300_cmdbuf.c

index b4bbe99..9af5c07 100644 (file)
@@ -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;
 }