summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_asic.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-01-05 22:11:07 -0500
committerDave Airlie <airlied@redhat.com>2012-01-06 09:16:38 +0000
commit3000bf393302a8c786e9ebfc778050cb0d6226c4 (patch)
tree2d2be47822cec764e1a83d6294b0f94b6591f5d6 /drivers/gpu/drm/radeon/radeon_asic.c
parent93504fce28b1a387ec01f81b26637d237dca2b36 (diff)
downloadtalos-op-linux-3000bf393302a8c786e9ebfc778050cb0d6226c4.tar.gz
talos-op-linux-3000bf393302a8c786e9ebfc778050cb0d6226c4.zip
drm/radeon/kms: sync across multiple rings when doing bo moves v3
We need to synchronize across rings when doing a bo move to make sure we the buffer is idle if it's in use by a different ring than the ring doing the move. v2: fix fence setup for bo moves v3: add missing ring lock/unlock Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 123a1969d284..36a6192ce862 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1036,6 +1036,9 @@ int radeon_asic_init(struct radeon_device *rdev)
else
rdev->num_crtc = 2;
+ /* set the ring used for bo copies */
+ rdev->copy_ring = RADEON_RING_TYPE_GFX_INDEX;
+
switch (rdev->family) {
case CHIP_R100:
case CHIP_RV100:
OpenPOWER on IntegriCloud