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

Commit 4645b94e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes 

* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next:
  drm/nv50: initialize ramht_refs list for faked 0 channel
  drm/nouveau: Don't take struct_mutex around the pushbuf IOCTL.
  drm/nouveau: Take fence spinlock before reading the last sequence.
parents ea39302b 615661f3

drivers/gpu/drm/nouveau/nouveau_fence.c

+4 −2
Original line number Diff line number Diff line
@@ -64,16 +64,17 @@ nouveau_fence_update(struct nouveau_channel *chan) 
	struct nouveau_fence *fence;

	uint32_t sequence;



	spin_lock(&chan->fence.lock);



	if (USE_REFCNT)

		sequence = nvchan_rd32(chan, 0x48);

	else

		sequence = atomic_read(&chan->fence.last_sequence_irq);



	if (chan->fence.sequence_ack == sequence)

		return;

		goto out;

	chan->fence.sequence_ack = sequence;



	spin_lock(&chan->fence.lock);

	list_for_each_safe(entry, tmp, &chan->fence.pending) {

		fence = list_entry(entry, struct nouveau_fence, entry);
@@ -85,6 +86,7 @@ nouveau_fence_update(struct nouveau_channel *chan) 
		if (sequence == chan->fence.sequence_ack)

			break;

	}

out:

	spin_unlock(&chan->fence.lock);

}

drivers/gpu/drm/nouveau/nouveau_gem.c

+2 −5
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ validate_fini_list(struct list_head *list, struct nouveau_fence *fence) 
		list_del(&nvbo->entry);

		nvbo->reserved_by = NULL;

		ttm_bo_unreserve(&nvbo->bo);

		drm_gem_object_unreference(nvbo->gem);

		drm_gem_object_unreference_unlocked(nvbo->gem);

	}

}
@@ -300,7 +300,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, 
			validate_fini(op, NULL);

			if (ret == -EAGAIN)

				ret = ttm_bo_wait_unreserved(&nvbo->bo, false);

			drm_gem_object_unreference(gem);

			drm_gem_object_unreference_unlocked(gem);

			if (ret) {

				NV_ERROR(dev, "fail reserve\n");

				return ret;
@@ -616,8 +616,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
		return PTR_ERR(bo);

	}



	mutex_lock(&dev->struct_mutex);



	/* Mark push buffers as being used on PFIFO, the validation code

	 * will then make sure that if the pushbuf bo moves, that they

	 * happen on the kernel channel, which will in turn cause a sync
@@ -731,7 +729,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, 
out:

	validate_fini(&op, fence);

	nouveau_fence_unref((void**)&fence);

	mutex_unlock(&dev->struct_mutex);

	kfree(bo);

	kfree(push);

drivers/gpu/drm/nouveau/nv50_instmem.c

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ nv50_instmem_init(struct drm_device *dev) 
	chan->file_priv = (struct drm_file *)-2;

	dev_priv->fifos[0] = dev_priv->fifos[127] = chan;



	INIT_LIST_HEAD(&chan->ramht_refs);



	/* Channel's PRAMIN object + heap */

	ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0,

							NULL, &chan->ramin);