Commit e774055a authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/fifo: tidy up channel creation event code

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 86d7442b
...@@ -91,8 +91,8 @@ nvkm_fifo_chan_chid(struct nvkm_fifo *fifo, int chid, unsigned long *rflags) ...@@ -91,8 +91,8 @@ nvkm_fifo_chan_chid(struct nvkm_fifo *fifo, int chid, unsigned long *rflags)
} }
static int static int
nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size, nvkm_fifo_cevent_ctor(struct nvkm_object *object, void *data, u32 size,
struct nvkm_notify *notify) struct nvkm_notify *notify)
{ {
if (size == 0) { if (size == 0) {
notify->size = 0; notify->size = 0;
...@@ -104,10 +104,16 @@ nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size, ...@@ -104,10 +104,16 @@ nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size,
} }
static const struct nvkm_event_func static const struct nvkm_event_func
nvkm_fifo_event_func = { nvkm_fifo_cevent_func = {
.ctor = nvkm_fifo_event_ctor, .ctor = nvkm_fifo_cevent_ctor,
}; };
void
nvkm_fifo_cevent(struct nvkm_fifo *fifo)
{
nvkm_event_send(&fifo->cevent, 1, 0, NULL, 0);
}
static void static void
nvkm_fifo_uevent_fini(struct nvkm_event *event, int type, int index) nvkm_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
{ {
...@@ -283,5 +289,5 @@ nvkm_fifo_ctor(const struct nvkm_fifo_func *func, struct nvkm_device *device, ...@@ -283,5 +289,5 @@ nvkm_fifo_ctor(const struct nvkm_fifo_func *func, struct nvkm_device *device,
return ret; return ret;
} }
return nvkm_event_init(&nvkm_fifo_event_func, 1, 1, &fifo->cevent); return nvkm_event_init(&nvkm_fifo_cevent_func, 1, 1, &fifo->cevent);
} }
...@@ -410,6 +410,6 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *func, ...@@ -410,6 +410,6 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *func,
base + user * chan->chid; base + user * chan->chid;
chan->size = user; chan->size = user;
nvkm_event_send(&fifo->cevent, 1, 0, NULL, 0); nvkm_fifo_cevent(fifo);
return 0; return 0;
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
int nvkm_fifo_ctor(const struct nvkm_fifo_func *, struct nvkm_device *, int nvkm_fifo_ctor(const struct nvkm_fifo_func *, struct nvkm_device *,
int index, int nr, struct nvkm_fifo *); int index, int nr, struct nvkm_fifo *);
void nvkm_fifo_uevent(struct nvkm_fifo *); void nvkm_fifo_uevent(struct nvkm_fifo *);
void nvkm_fifo_cevent(struct nvkm_fifo *);
struct nvkm_fifo_chan_oclass; struct nvkm_fifo_chan_oclass;
struct nvkm_fifo_func { struct nvkm_fifo_func {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment