diff mbox

drm/radeon: sync all BOs involved in a CS v2

Message ID 1417090378-14094-1-git-send-email-deathsimple@vodafone.de (mailing list archive)
State New, archived
Headers show

Commit Message

Christian König Nov. 27, 2014, 12:12 p.m. UTC 
From: Christian König <christian.koenig@amd.com>

Not just the userspace relocs, otherwise we won't wait
for a swapped out page tables to be swapped in again.

v2: rebased on Alex current drm-fixes-3.18

Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/radeon/radeon_cs.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Comments

Alex Deucher Dec. 1, 2014, 4:01 a.m. UTC | #1 
On Thu, Nov 27, 2014 at 7:12 AM, Christian König
<deathsimple@vodafone.de> wrote:
> From: Christian König <christian.koenig@amd.com>
>
> Not just the userspace relocs, otherwise we won't wait
> for a swapped out page tables to be swapped in again.
>
> v2: rebased on Alex current drm-fixes-3.18
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Cc: stable@vger.kernel.org

Applied to my -fixes tree.

Thanks,

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_cs.c | 17 +++++++----------
>  1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
> index a3e7aed..6f377de 100644
> --- a/drivers/gpu/drm/radeon/radeon_cs.c
> +++ b/drivers/gpu/drm/radeon/radeon_cs.c
> @@ -251,22 +251,19 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
>
>  static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
>  {
> -       int i, r = 0;
> +       struct radeon_cs_reloc *reloc;
> +       int r;
>
> -       for (i = 0; i < p->nrelocs; i++) {
> +       list_for_each_entry(reloc, &p->validated, tv.head) {
>                 struct reservation_object *resv;
>
> -               if (!p->relocs[i].robj)
> -                       continue;
> -
> -               resv = p->relocs[i].robj->tbo.resv;
> +               resv = reloc->robj->tbo.resv;
>                 r = radeon_semaphore_sync_resv(p->rdev, p->ib.semaphore, resv,
> -                                              p->relocs[i].tv.shared);
> -
> +                                              reloc->tv.shared);
>                 if (r)
> -                       break;
> +                       return r;
>         }
> -       return r;
> +       return 0;
>  }
>
>  /* XXX: note that this is called from the legacy UMS CS ioctl as well */
> --
> 1.9.1
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index a3e7aed..6f377de 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -251,22 +251,19 @@  static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
 
 static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
 {
-	int i, r = 0;
+	struct radeon_cs_reloc *reloc;
+	int r;
 
-	for (i = 0; i < p->nrelocs; i++) {
+	list_for_each_entry(reloc, &p->validated, tv.head) {
 		struct reservation_object *resv;
 
-		if (!p->relocs[i].robj)
-			continue;
-
-		resv = p->relocs[i].robj->tbo.resv;
+		resv = reloc->robj->tbo.resv;
 		r = radeon_semaphore_sync_resv(p->rdev, p->ib.semaphore, resv,
-					       p->relocs[i].tv.shared);
-
+					       reloc->tv.shared);
 		if (r)
-			break;
+			return r;
 	}
-	return r;
+	return 0;
 }
 
 /* XXX: note that this is called from the legacy UMS CS ioctl as well */