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

Commit a25f83ba authored by Peter Hurley's avatar Peter Hurley Committed by Ben Skeggs
Browse files

drm/nouveau/core: Add priv field for event handlers 



Provide private field for event handlers exclusive use.
Convert nouveau_fence_wait_uevent() and
nouveau_fence_wait_uevent_handler(); drop struct nouveau_fence_uevent.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent ca356222

drivers/gpu/drm/nouveau/core/include/core/event.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


struct nouveau_eventh {

	struct list_head head;

	void *priv;

	int (*func)(struct nouveau_eventh *, int index);

};

drivers/gpu/drm/nouveau/nouveau_fence.c

+7 −13
Original line number Diff line number Diff line
@@ -165,17 +165,11 @@ nouveau_fence_done(struct nouveau_fence *fence) 
	return !fence->channel;

}



struct nouveau_fence_uevent {

	struct nouveau_eventh handler;

	struct nouveau_fence_priv *priv;

};



static int

nouveau_fence_wait_uevent_handler(struct nouveau_eventh *event, int index)

nouveau_fence_wait_uevent_handler(struct nouveau_eventh *handler, int index)

{

	struct nouveau_fence_uevent *uevent =

		container_of(event, struct nouveau_fence_uevent, handler);

	wake_up_all(&uevent->priv->waiting);

	struct nouveau_fence_priv *priv = handler->priv;

	wake_up_all(&priv->waiting);

	return NVKM_EVENT_KEEP;

}
@@ -186,13 +180,13 @@ nouveau_fence_wait_uevent(struct nouveau_fence *fence, bool intr) 
	struct nouveau_channel *chan = fence->channel;

	struct nouveau_fifo *pfifo = nouveau_fifo(chan->drm->device);

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

	struct nouveau_fence_uevent uevent = {

		.handler.func = nouveau_fence_wait_uevent_handler,

	struct nouveau_eventh handler = {

		.func = nouveau_fence_wait_uevent_handler,

		.priv = priv,

	};

	int ret = 0;



	nouveau_event_get(pfifo->uevent, 0, &uevent.handler);

	nouveau_event_get(pfifo->uevent, 0, &handler);



	if (fence->timeout) {

		unsigned long timeout = fence->timeout - jiffies;
@@ -224,7 +218,7 @@ nouveau_fence_wait_uevent(struct nouveau_fence *fence, bool intr) 
		}

	}



	nouveau_event_put(pfifo->uevent, 0, &uevent.handler);

	nouveau_event_put(pfifo->uevent, 0, &handler);

	if (unlikely(ret < 0))

		return ret;