Commit 10842ba0 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: remove unused nouveau_fence_work() 



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

drivers/gpu/drm/nouveau/nouveau_fence.c

+0 −56
Original line number Diff line number Diff line
@@ -199,62 +199,6 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha 
	WARN_ON(ret);

}



struct nouveau_fence_work {

	struct work_struct work;

	struct dma_fence_cb cb;

	void (*func)(void *);

	void *data;

};



static void

nouveau_fence_work_handler(struct work_struct *kwork)

{

	struct nouveau_fence_work *work = container_of(kwork, typeof(*work), work);

	work->func(work->data);

	kfree(work);

}



static void nouveau_fence_work_cb(struct dma_fence *fence, struct dma_fence_cb *cb)

{

	struct nouveau_fence_work *work = container_of(cb, typeof(*work), cb);



	schedule_work(&work->work);

}



void

nouveau_fence_work(struct dma_fence *fence,

		   void (*func)(void *), void *data)

{

	struct nouveau_fence_work *work;



	if (dma_fence_is_signaled(fence))

		goto err;



	work = kmalloc(sizeof(*work), GFP_KERNEL);

	if (!work) {

		/*

		 * this might not be a nouveau fence any more,

		 * so force a lazy wait here

		 */

		WARN_ON(nouveau_fence_wait((struct nouveau_fence *)fence,

					   true, false));

		goto err;

	}



	INIT_WORK(&work->work, nouveau_fence_work_handler);

	work->func = func;

	work->data = data;



	if (dma_fence_add_callback(fence, &work->cb, nouveau_fence_work_cb) < 0)

		goto err_free;

	return;



err_free:

	kfree(work);

err:

	func(data);

}



int

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

{

drivers/gpu/drm/nouveau/nouveau_fence.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ void nouveau_fence_unref(struct nouveau_fence **); 


int  nouveau_fence_emit(struct nouveau_fence *, struct nouveau_channel *);

bool nouveau_fence_done(struct nouveau_fence *);

void nouveau_fence_work(struct dma_fence *, void (*)(void *), void *);

int  nouveau_fence_wait(struct nouveau_fence *, bool lazy, bool intr);

int  nouveau_fence_sync(struct nouveau_bo *, struct nouveau_channel *, bool exclusive, bool intr);