Commit 133f4cb3 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie

drm/radeon: fix possible lack of synchronization btw ttm and other ring

We need to sync with the GFX ring as ttm might have schedule bo move
on it and new command scheduled for other ring need to wait for bo
data to be in place.
Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed by: Christian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4f256e8a
...@@ -122,17 +122,17 @@ static int radeon_cs_sync_rings(struct radeon_cs_parser *p) ...@@ -122,17 +122,17 @@ static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
int i, r; int i, r;
for (i = 0; i < p->nrelocs; i++) { for (i = 0; i < p->nrelocs; i++) {
struct radeon_fence *fence;
if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj) if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj)
continue; continue;
if (!(p->relocs[i].flags & RADEON_RELOC_DONT_SYNC)) { fence = p->relocs[i].robj->tbo.sync_obj;
struct radeon_fence *fence = p->relocs[i].robj->tbo.sync_obj;
if (fence->ring != p->ring && !radeon_fence_signaled(fence)) { if (fence->ring != p->ring && !radeon_fence_signaled(fence)) {
sync_to_ring[fence->ring] = true; sync_to_ring[fence->ring] = true;
need_sync = true; need_sync = true;
} }
} }
}
if (!need_sync) { if (!need_sync) {
return 0; return 0;
......
...@@ -926,7 +926,6 @@ struct drm_radeon_cs_chunk { ...@@ -926,7 +926,6 @@ struct drm_radeon_cs_chunk {
}; };
/* drm_radeon_cs_reloc.flags */ /* drm_radeon_cs_reloc.flags */
#define RADEON_RELOC_DONT_SYNC 0x01
struct drm_radeon_cs_reloc { struct drm_radeon_cs_reloc {
uint32_t handle; uint32_t handle;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment