aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-04-27 11:04:37 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-04-27 11:38:28 -0400
commit9fb2bcf928ed5c664affaeb7edf9cc19f590b9f3 (patch)
tree219ba78813a9c9cee78af5dfdfe4e3bbef5714c4
parentc29c0876ec05d51a93508a39b90b92c29ba6423d (diff)
drm/radeon: fix userptr return value checking (v2)
Otherwise we print false warning from time to time. v2: agd5f: rebase Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Jack Xiao <Jack.Xiao@amd.com> CC: stable@vger.kernel.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_mn.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index 01701376b239..535bf404b725 100644
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -135,7 +135,7 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
135 while (it) { 135 while (it) {
136 struct radeon_mn_node *node; 136 struct radeon_mn_node *node;
137 struct radeon_bo *bo; 137 struct radeon_bo *bo;
138 int r; 138 long r;
139 139
140 node = container_of(it, struct radeon_mn_node, it); 140 node = container_of(it, struct radeon_mn_node, it);
141 it = interval_tree_iter_next(it, start, end); 141 it = interval_tree_iter_next(it, start, end);
@@ -144,19 +144,19 @@ static void radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
144 144
145 r = radeon_bo_reserve(bo, true); 145 r = radeon_bo_reserve(bo, true);
146 if (r) { 146 if (r) {
147 DRM_ERROR("(%d) failed to reserve user bo\n", r); 147 DRM_ERROR("(%ld) failed to reserve user bo\n", r);
148 continue; 148 continue;
149 } 149 }
150 150
151 r = reservation_object_wait_timeout_rcu(bo->tbo.resv, 151 r = reservation_object_wait_timeout_rcu(bo->tbo.resv,
152 true, false, MAX_SCHEDULE_TIMEOUT); 152 true, false, MAX_SCHEDULE_TIMEOUT);
153 if (r) 153 if (r <= 0)
154 DRM_ERROR("(%d) failed to wait for user bo\n", r); 154 DRM_ERROR("(%ld) failed to wait for user bo\n", r);
155 155
156 radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_CPU); 156 radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_CPU);
157 r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false); 157 r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
158 if (r) 158 if (r)
159 DRM_ERROR("(%d) failed to validate user bo\n", r); 159 DRM_ERROR("(%ld) failed to validate user bo\n", r);
160 160
161 radeon_bo_unreserve(bo); 161 radeon_bo_unreserve(bo);
162 } 162 }