Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b27638 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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



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: default avatarChristian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8b62c8c6

drivers/gpu/drm/radeon/radeon_cs.c

+7 −10
Original line number Diff line number Diff line
@@ -251,23 +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_semaphore_sync_resv(p->rdev, p->ib.semaphore, resv,

					       p->relocs[i].tv.shared);



					       reloc->tv.shared);

		if (r)

			break;

	}

			return r;

	}

	return 0;

}



/* XXX: note that this is called from the legacy UMS CS ioctl as well */

int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data)