From: Christian König <deathsimple@vodafone.de>
Date: Thu, 6 Sep 2012 11:48:07 +0000 (+0200)
Subject: drm/radeon: fix VM syncing with multiple rings
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1678dbc22e4b2cfe24a7e042d822ddb837e378c0;p=linux.git

drm/radeon: fix VM syncing with multiple rings

When a VM is used on more than one ring we need to
sync to the last user.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
---

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index e24150659bc75..d59eb59cdb813 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -463,7 +463,7 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev,
 		goto out;
 	}
 	radeon_cs_sync_rings(parser);
-	radeon_cs_sync_to(parser, vm->last_flush);
+	radeon_cs_sync_to(parser, vm->fence);
 	radeon_cs_sync_to(parser, radeon_vm_grab_id(rdev, vm, parser->ring));
 
 	if ((rdev->family >= CHIP_TAHITI) &&