diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-09-11 10:09:58 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-09-20 13:10:41 -0400 |
| commit | 96a5844f90a6d3b1c0cabfe4870e62e7b1cc4640 (patch) | |
| tree | faddf0d61c513bcb5516622595e38037a5334dea /drivers/gpu/drm/radeon/radeon_gart.c | |
| parent | a36e70b2e55539aba0ba8a934c46b71c235488ac (diff) | |
drm/radeon: fix VA overlap check
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_gart.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_gart.c | 2 |
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, | |||
| 736 | /* bo can be added before this one */ | 736 | /* bo can be added before this one */ |
| 737 | break; | 737 | break; |
| 738 | } | 738 | } |
| 739 | if (bo_va->soffset >= tmp->soffset && bo_va->soffset < tmp->eoffset) { | 739 | if (bo_va->eoffset > tmp->soffset && bo_va->soffset < tmp->eoffset) { |
| 740 | /* bo and tmp overlap, invalid offset */ | 740 | /* bo and tmp overlap, invalid offset */ |
| 741 | dev_err(rdev->dev, "bo %p va 0x%08X conflict with (bo %p 0x%08X 0x%08X)\n", | 741 | dev_err(rdev->dev, "bo %p va 0x%08X conflict with (bo %p 0x%08X 0x%08X)\n", |
| 742 | bo, (unsigned)bo_va->soffset, tmp->bo, | 742 | bo, (unsigned)bo_va->soffset, tmp->bo, |