[PATCH 05/11] drm/radeon: add sync helper function

2012-08-20 Thread Christian König 
Signed-off-by: Christian K?nig 
Reviewed-by: Jerome Glisse 
---
 drivers/gpu/drm/radeon/radeon_cs.c |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c 
b/drivers/gpu/drm/radeon/radeon_cs.c
index 0a9d1eb..85a80e4 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -115,19 +115,27 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, 
u32 ring, s32 priority
return 0;
 }

+static void radeon_cs_sync_to(struct radeon_cs_parser *p,
+ struct radeon_fence *fence)
+{
+   struct radeon_fence *other;
+
+   if (!fence)
+   return;
+
+   other = p->ib.sync_to[fence->ring];
+   p->ib.sync_to[fence->ring] = radeon_fence_later(fence, other);
+}
+
 static void radeon_cs_sync_rings(struct radeon_cs_parser *p)
 {
int i;

for (i = 0; i < p->nrelocs; i++) {
-   struct radeon_fence *a, *b;
-
-   if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj)
+   if (!p->relocs[i].robj)
continue;

-   a = p->relocs[i].robj->tbo.sync_obj;
-   b = p->ib.sync_to[a->ring];
-   p->ib.sync_to[a->ring] = radeon_fence_later(a, b);
+   radeon_cs_sync_to(p, p->relocs[i].robj->tbo.sync_obj);
}
 }

-- 
1.7.9.5

[PATCH 05/11] drm/radeon: add sync helper function

2012-08-20 Thread Christian König 
Signed-off-by: Christian König deathsim...@vodafone.de
Reviewed-by: Jerome Glisse jgli...@redhat.com
---
 drivers/gpu/drm/radeon/radeon_cs.c |   20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c 
b/drivers/gpu/drm/radeon/radeon_cs.c
index 0a9d1eb..85a80e4 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -115,19 +115,27 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, 
u32 ring, s32 priority
return 0;
 }
 
+static void radeon_cs_sync_to(struct radeon_cs_parser *p,
+ struct radeon_fence *fence)
+{
+   struct radeon_fence *other;
+
+   if (!fence)
+   return;
+
+   other = p-ib.sync_to[fence-ring];
+   p-ib.sync_to[fence-ring] = radeon_fence_later(fence, other);
+}
+
 static void radeon_cs_sync_rings(struct radeon_cs_parser *p)
 {
int i;
 
for (i = 0; i  p-nrelocs; i++) {
-   struct radeon_fence *a, *b;
-
-   if (!p-relocs[i].robj || !p-relocs[i].robj-tbo.sync_obj)
+   if (!p-relocs[i].robj)
continue;
 
-   a = p-relocs[i].robj-tbo.sync_obj;
-   b = p-ib.sync_to[a-ring];
-   p-ib.sync_to[a-ring] = radeon_fence_later(a, b);
+   radeon_cs_sync_to(p, p-relocs[i].robj-tbo.sync_obj);
}
 }
 
-- 
1.7.9.5

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel