Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

+13 -6
+11 -5
drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
··· 91 91 } 92 92 93 93 static int 94 - nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size, 95 - struct nvkm_notify *notify) 94 + nvkm_fifo_cevent_ctor(struct nvkm_object *object, void *data, u32 size, 95 + struct nvkm_notify *notify) 96 96 { 97 97 if (size == 0) { 98 98 notify->size = 0; ··· 104 104 } 105 105 106 106 static const struct nvkm_event_func 107 - nvkm_fifo_event_func = { 108 - .ctor = nvkm_fifo_event_ctor, 107 + nvkm_fifo_cevent_func = { 108 + .ctor = nvkm_fifo_cevent_ctor, 109 109 }; 110 + 111 + void 112 + nvkm_fifo_cevent(struct nvkm_fifo *fifo) 113 + { 114 + nvkm_event_send(&fifo->cevent, 1, 0, NULL, 0); 115 + } 110 116 111 117 static void 112 118 nvkm_fifo_uevent_fini(struct nvkm_event *event, int type, int index) ··· 289 283 return ret; 290 284 } 291 285 292 - return nvkm_event_init(&nvkm_fifo_event_func, 1, 1, &fifo->cevent); 286 + return nvkm_event_init(&nvkm_fifo_cevent_func, 1, 1, &fifo->cevent); 293 287 }
+1 -1
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
··· 410 410 base + user * chan->chid; 411 411 chan->size = user; 412 412 413 - nvkm_event_send(&fifo->cevent, 1, 0, NULL, 0); 413 + nvkm_fifo_cevent(fifo); 414 414 return 0; 415 415 }
+1
drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
··· 6 6 int nvkm_fifo_ctor(const struct nvkm_fifo_func *, struct nvkm_device *, 7 7 int index, int nr, struct nvkm_fifo *); 8 8 void nvkm_fifo_uevent(struct nvkm_fifo *); 9 + void nvkm_fifo_cevent(struct nvkm_fifo *); 9 10 10 11 struct nvkm_fifo_chan_oclass; 11 12 struct nvkm_fifo_func {