summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-09-11 16:09:58 +0200
committerAlex Deucher <alexander.deucher@amd.com>2012-09-20 13:10:41 -0400
commit96a5844f90a6d3b1c0cabfe4870e62e7b1cc4640 (patch)
treefaddf0d61c513bcb5516622595e38037a5334dea
parenta36e70b2e55539aba0ba8a934c46b71c235488ac (diff)
downloadblackbird-op-linux-96a5844f90a6d3b1c0cabfe4870e62e7b1cc4640.tar.gz
blackbird-op-linux-96a5844f90a6d3b1c0cabfe4870e62e7b1cc4640.zip
drm/radeon: fix VA overlap check
Signed-off-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Jerome Glisse <jglisse@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_gart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index 614e31a6f832..5694421b7c67 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -736,7 +736,7 @@ int radeon_vm_bo_add(struct radeon_device *rdev,
/* bo can be added before this one */
break;
}
- if (bo_va->soffset >= tmp->soffset && bo_va->soffset < tmp->eoffset) {
+ if (bo_va->eoffset > tmp->soffset && bo_va->soffset < tmp->eoffset) {
/* bo and tmp overlap, invalid offset */
dev_err(rdev->dev, "bo %p va 0x%08X conflict with (bo %p 0x%08X 0x%08X)\n",
bo, (unsigned)bo_va->soffset, tmp->bo,
OpenPOWER on IntegriCloud