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

Commit 827520ce authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fence: make internal hooks part of the context 



A step towards being able to provide fences from other engines not
connected to PFIFO.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 60e5cb79

drivers/gpu/drm/nouveau/nouveau_fence.c

+4 −6
Original line number Diff line number Diff line
@@ -61,13 +61,12 @@ nouveau_fence_context_new(struct nouveau_fence_chan *fctx) 
static void

nouveau_fence_update(struct nouveau_channel *chan)

{

	struct nouveau_fence_priv *priv = chan->drm->fence;

	struct nouveau_fence_chan *fctx = chan->fence;

	struct nouveau_fence *fence, *fnext;



	spin_lock(&fctx->lock);

	list_for_each_entry_safe(fence, fnext, &fctx->pending, head) {

		if (priv->read(chan) < fence->sequence)

		if (fctx->read(chan) < fence->sequence)

			break;



		if (fence->work)
@@ -82,7 +81,6 @@ nouveau_fence_update(struct nouveau_channel *chan) 
int

nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan)

{

	struct nouveau_fence_priv *priv = chan->drm->fence;

	struct nouveau_fence_chan *fctx = chan->fence;

	int ret;
@@ -90,7 +88,7 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan) 
	fence->timeout  = jiffies + (3 * DRM_HZ);

	fence->sequence = ++fctx->sequence;



	ret = priv->emit(fence);

	ret = fctx->emit(fence);

	if (!ret) {

		kref_get(&fence->kref);

		spin_lock(&fctx->lock);
@@ -219,14 +217,14 @@ nouveau_fence_wait(struct nouveau_fence *fence, bool lazy, bool intr) 
int

nouveau_fence_sync(struct nouveau_fence *fence, struct nouveau_channel *chan)

{

	struct nouveau_fence_priv *priv = chan->drm->fence;

	struct nouveau_fence_chan *fctx = chan->fence;

	struct nouveau_channel *prev;

	int ret = 0;



	prev = fence ? fence->channel : NULL;

	if (prev) {

		if (unlikely(prev != chan && !nouveau_fence_done(fence))) {

			ret = priv->sync(fence, prev, chan);

			ret = fctx->sync(fence, prev, chan);

			if (unlikely(ret))

				ret = nouveau_fence_wait(fence, true, false);

		}

drivers/gpu/drm/nouveau/nouveau_fence.h

+7 −6
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ struct nouveau_fence_chan { 
	struct list_head pending;

	struct list_head flip;



	int  (*emit)(struct nouveau_fence *);

	int  (*sync)(struct nouveau_fence *, struct nouveau_channel *,

		     struct nouveau_channel *);

	u32  (*read)(struct nouveau_channel *);

	int  (*emit32)(struct nouveau_channel *, u64, u32);

	int  (*sync32)(struct nouveau_channel *, u64, u32);



	spinlock_t lock;

	u32 sequence;

};
@@ -39,12 +46,6 @@ struct nouveau_fence_priv { 
	void (*resume)(struct nouveau_drm *);

	int  (*context_new)(struct nouveau_channel *);

	void (*context_del)(struct nouveau_channel *);

	int  (*emit32)(struct nouveau_channel *, u64, u32);

	int  (*emit)(struct nouveau_fence *);

	int  (*sync32)(struct nouveau_channel *, u64, u32);

	int  (*sync)(struct nouveau_fence *, struct nouveau_channel *,

		     struct nouveau_channel *);

	u32  (*read)(struct nouveau_channel *);



	wait_queue_head_t waiting;

	bool uevent;

drivers/gpu/drm/nouveau/nv04_fence.c

+3 −3
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ nv04_fence_context_new(struct nouveau_channel *chan) 
	struct nv04_fence_chan *fctx = kzalloc(sizeof(*fctx), GFP_KERNEL);

	if (fctx) {

		nouveau_fence_context_new(&fctx->base);

		fctx->base.emit = nv04_fence_emit;

		fctx->base.sync = nv04_fence_sync;

		fctx->base.read = nv04_fence_read;

		chan->fence = fctx;

		return 0;

	}
@@ -104,8 +107,5 @@ nv04_fence_create(struct nouveau_drm *drm) 
	priv->base.dtor = nv04_fence_destroy;

	priv->base.context_new = nv04_fence_context_new;

	priv->base.context_del = nv04_fence_context_del;

	priv->base.emit = nv04_fence_emit;

	priv->base.sync = nv04_fence_sync;

	priv->base.read = nv04_fence_read;

	return 0;

}

drivers/gpu/drm/nouveau/nv10_fence.c

+3 −3
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ nv10_fence_context_new(struct nouveau_channel *chan) 
		return -ENOMEM;



	nouveau_fence_context_new(&fctx->base);

	fctx->base.emit = nv10_fence_emit;

	fctx->base.read = nv10_fence_read;

	fctx->base.sync = nv10_fence_sync;

	return 0;

}
@@ -102,9 +105,6 @@ nv10_fence_create(struct nouveau_drm *drm) 
	priv->base.dtor = nv10_fence_destroy;

	priv->base.context_new = nv10_fence_context_new;

	priv->base.context_del = nv10_fence_context_del;

	priv->base.emit = nv10_fence_emit;

	priv->base.read = nv10_fence_read;

	priv->base.sync = nv10_fence_sync;

	spin_lock_init(&priv->lock);

	return 0;

}

drivers/gpu/drm/nouveau/nv17_fence.c

+3 −3
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ nv17_fence_context_new(struct nouveau_channel *chan) 
		return -ENOMEM;



	nouveau_fence_context_new(&fctx->base);

	fctx->base.emit = nv10_fence_emit;

	fctx->base.read = nv10_fence_read;

	fctx->base.sync = nv17_fence_sync;



	ret = nouveau_object_new(nv_object(chan->cli), chan->handle,

				 NvSema, 0x0002,
@@ -121,9 +124,6 @@ nv17_fence_create(struct nouveau_drm *drm) 
	priv->base.resume = nv17_fence_resume;

	priv->base.context_new = nv17_fence_context_new;

	priv->base.context_del = nv10_fence_context_del;

	priv->base.emit = nv10_fence_emit;

	priv->base.read = nv10_fence_read;

	priv->base.sync = nv17_fence_sync;

	spin_lock_init(&priv->lock);



	ret = nouveau_bo_new(drm->dev, 4096, 0x1000, TTM_PL_FLAG_VRAM,