Commit ce9b333c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-misc-fixes' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes 



This merges two fixes that haven't been sent to me yet, but I wanted to get in.

One amdgpu fix, but one nouveau regression fixer.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents aeeb82fd 67f74302

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) 
	struct amdgpu_vm_bo_base *bo_base;

	int r;



	if (bo->tbo.resource->mem_type == TTM_PL_SYSTEM)

	if (!bo->tbo.resource || bo->tbo.resource->mem_type == TTM_PL_SYSTEM)

		return;



	r = ttm_bo_validate(&bo->tbo, &placement, &ctx);

drivers/gpu/drm/nouveau/nouveau_fence.c

+15 −13
Original line number Diff line number Diff line
@@ -353,15 +353,22 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e 


		if (ret)

			return ret;

	}



		fobj = NULL;

	} else {

		fobj = dma_resv_shared_list(resv);

	fence = dma_resv_excl_fence(resv);

	}



	if (fence) {

	/* Waiting for the exclusive fence first causes performance regressions

	 * under some circumstances. So manually wait for the shared ones first.

	 */

	for (i = 0; i < (fobj ? fobj->shared_count : 0) && !ret; ++i) {

		struct nouveau_channel *prev = NULL;

		bool must_wait = true;



		fence = rcu_dereference_protected(fobj->shared[i],

						dma_resv_held(resv));



		f = nouveau_local_fence(fence, chan->drm);

		if (f) {

			rcu_read_lock();
@@ -373,20 +380,13 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e 


		if (must_wait)

			ret = dma_fence_wait(fence, intr);



		return ret;

	}



	if (!exclusive || !fobj)

		return ret;



	for (i = 0; i < fobj->shared_count && !ret; ++i) {

	fence = dma_resv_excl_fence(resv);

	if (fence) {

		struct nouveau_channel *prev = NULL;

		bool must_wait = true;



		fence = rcu_dereference_protected(fobj->shared[i],

						dma_resv_held(resv));



		f = nouveau_local_fence(fence, chan->drm);

		if (f) {

			rcu_read_lock();
@@ -398,6 +398,8 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e 


		if (must_wait)

			ret = dma_fence_wait(fence, intr);



		return ret;

	}



	return ret;