On Wed, Nov 26, 2014 at 10:29 AM, Christian König
<deathsimple@xxxxxxxxxxx> wrote:
> From: Christian König <christian.koenig@xxxxxxx>
>
> Not just the userspace relocs, otherwise we won't wait
> for a swapped out page tables to be swapped in again.
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
Pulled into my -next tree. Unfortunately, this doesn't apply to
-fixes or stable as is.
Alex
> ---
> drivers/gpu/drm/radeon/radeon_cs.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
> index 75f22e5..f5e0a69 100644
> --- a/drivers/gpu/drm/radeon/radeon_cs.c
> +++ b/drivers/gpu/drm/radeon/radeon_cs.c
> @@ -251,22 +251,20 @@ 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_sync_resv(p->rdev, &p->ib.sync, 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 */
> @@ -505,9 +503,6 @@ static int radeon_bo_vm_update_pte(struct radeon_cs_parser *p,
> if (r)
> return r;
>
> - radeon_sync_resv(p->rdev, &p->ib.sync, vm->page_directory->tbo.resv,
> - true);
> -
> r = radeon_vm_clear_freed(rdev, vm);
> if (r)
> return r;
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
