diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2012-01-05 22:11:07 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-06 04:16:38 -0500 |
| commit | 3000bf393302a8c786e9ebfc778050cb0d6226c4 (patch) | |
| tree | 2d2be47822cec764e1a83d6294b0f94b6591f5d6 /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | 93504fce28b1a387ec01f81b26637d237dca2b36 (diff) | |
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.c | 3 |
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) | |||
| 1036 | else | 1036 | else |
| 1037 | rdev->num_crtc = 2; | 1037 | rdev->num_crtc = 2; |
| 1038 | 1038 | ||
| 1039 | /* set the ring used for bo copies */ | ||
| 1040 | rdev->copy_ring = RADEON_RING_TYPE_GFX_INDEX; | ||
| 1041 | |||
| 1039 | switch (rdev->family) { | 1042 | switch (rdev->family) { |
| 1040 | case CHIP_R100: | 1043 | case CHIP_R100: |
| 1041 | case CHIP_RV100: | 1044 | case CHIP_RV100: |