From 6b7165566fb047aeaa6c4f68a45dc29d2a4a0775 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Mon, 13 Aug 2012 12:07:33 -0400 Subject: [PATCH] --- yaml --- r: 329551 b: refs/heads/master c: 3e8970f96ba2539539059736039f09624da9fe11 h: refs/heads/master i: 329549: f9ff66093f1db7d33c7182ab5515393c2ff081ba 329547: a1cc89c8ff8e7e112baa823dc20947f6ca74f693 329543: dd270fb3a5de260f25c16741290dcf13df1801a8 329535: d4a1da2962951ac5d430dd129df8d4ccfa712183 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_cs.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cc5ced6b9bc6..c339b6d51110 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 089a786e2cf5d07d495b3cb1ac0b959c6dd10d49 +refs/heads/master: 3e8970f96ba2539539059736039f09624da9fe11 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cs.c b/trunk/drivers/gpu/drm/radeon/radeon_cs.c index 300fc25d9003..3ae7c27c9d6c 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_cs.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_cs.c @@ -372,10 +372,15 @@ static int radeon_cs_ib_chunk(struct radeon_device *rdev, static int radeon_bo_vm_update_pte(struct radeon_cs_parser *parser, struct radeon_vm *vm) { + struct radeon_device *rdev = parser->rdev; struct radeon_bo_list *lobj; struct radeon_bo *bo; int r; + r = radeon_vm_bo_update_pte(rdev, vm, rdev->ring_tmp_bo.bo, &rdev->ring_tmp_bo.bo->tbo.mem); + if (r) { + return r; + } list_for_each_entry(lobj, &parser->validated, tv.head) { bo = lobj->bo; r = radeon_vm_bo_update_pte(parser->rdev, vm, bo, &bo->tbo.mem);