diff options
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 12 | ||||
-rw-r--r-- | include/drm/radeon_drm.h | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index c66beb1662b5..289b0d786e97 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
@@ -122,15 +122,15 @@ static int radeon_cs_sync_rings(struct radeon_cs_parser *p) | |||
122 | int i, r; | 122 | int i, r; |
123 | 123 | ||
124 | for (i = 0; i < p->nrelocs; i++) { | 124 | for (i = 0; i < p->nrelocs; i++) { |
125 | struct radeon_fence *fence; | ||
126 | |||
125 | if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj) | 127 | if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj) |
126 | continue; | 128 | continue; |
127 | 129 | ||
128 | if (!(p->relocs[i].flags & RADEON_RELOC_DONT_SYNC)) { | 130 | fence = p->relocs[i].robj->tbo.sync_obj; |
129 | struct radeon_fence *fence = p->relocs[i].robj->tbo.sync_obj; | 131 | if (fence->ring != p->ring && !radeon_fence_signaled(fence)) { |
130 | if (fence->ring != p->ring && !radeon_fence_signaled(fence)) { | 132 | sync_to_ring[fence->ring] = true; |
131 | sync_to_ring[fence->ring] = true; | 133 | need_sync = true; |
132 | need_sync = true; | ||
133 | } | ||
134 | } | 134 | } |
135 | } | 135 | } |
136 | 136 | ||
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h index 7c491b4bcf65..58056865b8e9 100644 --- a/include/drm/radeon_drm.h +++ b/include/drm/radeon_drm.h | |||
@@ -926,7 +926,6 @@ struct drm_radeon_cs_chunk { | |||
926 | }; | 926 | }; |
927 | 927 | ||
928 | /* drm_radeon_cs_reloc.flags */ | 928 | /* drm_radeon_cs_reloc.flags */ |
929 | #define RADEON_RELOC_DONT_SYNC 0x01 | ||
930 | 929 | ||
931 | struct drm_radeon_cs_reloc { | 930 | struct drm_radeon_cs_reloc { |
932 | uint32_t handle; | 931 | uint32_t handle; |