summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-09-06 13:48:07 +0200
committerAlex Deucher <alexander.deucher@amd.com>2012-09-20 13:10:41 -0400
commit1678dbc22e4b2cfe24a7e042d822ddb837e378c0 (patch)
tree93d277cf2c680e9a69af61c3cb22e4765065c2b6
parente9e2fbe975a1938b1acadb94ac7d5934298974ac (diff)
downloadlinux-3.10-1678dbc22e4b2cfe24a7e042d822ddb837e378c0.tar.gz
linux-3.10-1678dbc22e4b2cfe24a7e042d822ddb837e378c0.tar.bz2
linux-3.10-1678dbc22e4b2cfe24a7e042d822ddb837e378c0.zip
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>
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index e24150659bc..d59eb59cdb8 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) &&