---

yaml --- r: 298515 b: refs/heads/master c: e199fd4 h: refs/heads/master i: 298513: d9b1d28 298511: 5828125 v: v3
git-mirror · Apr 2, 2012 · 90ee2ab · 90ee2ab
1 parent 1f8ed9e
commit 90ee2ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa9e855025b19e96e493ee00de7d933a9794f742
+refs/heads/master: e199fd422420d1620cf64fd9bdd4ff8bc255cc76
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_object.c b/trunk/drivers/gpu/drm/radeon/radeon_object.c
@@ -241,7 +241,8 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,
 				domain_start = bo->rdev->mc.vram_start;
 			else
 				domain_start = bo->rdev->mc.gtt_start;
-			WARN_ON_ONCE((*gpu_addr - domain_start) > max_offset);
+			WARN_ON_ONCE(max_offset <
+				     (radeon_bo_gpu_offset(bo) - domain_start));
 		}
 
 		return 0;