From 166abb7c7693302b164bbeeb456d4c461cac0e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 2 May 2012 15:11:14 +0200 Subject: [PATCH] --- yaml --- r: 307214 b: refs/heads/master c: 96050bca22f4fe6c8db175e02c8530a9720e5e9b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_sa.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 98e815f4aa15..81d2756efa0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36abacaed34bc1f5bcb11ca611dd3a06c5c0ef39 +refs/heads/master: 96050bca22f4fe6c8db175e02c8530a9720e5e9b diff --git a/trunk/drivers/gpu/drm/radeon/radeon_sa.c b/trunk/drivers/gpu/drm/radeon/radeon_sa.c index 4cce47e7dc0d..8fbfe69b7bcb 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_sa.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_sa.c @@ -150,7 +150,7 @@ int radeon_sa_bo_new(struct radeon_device *rdev, offset = 0; list_for_each_entry(tmp, &sa_manager->sa_bo, list) { /* room before this object ? */ - if ((tmp->offset - offset) >= size) { + if (offset < tmp->offset && (tmp->offset - offset) >= size) { head = tmp->list.prev; goto out; }