drm/nouveau/fifo: tidy up channel creation event code (e774055a) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ nvkm_fifo_chan_chid(struct nvkm_fifo fifo, int chid, unsigned long rflags)
		}

		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)
		{
		if (size == 0) {
		@@ -104,10 +104,16 @@ nvkm_fifo_event_ctor(struct nvkm_object object, void data, u32 size,
		}

		static const struct nvkm_event_func
		nvkm_fifo_event_func = {
		.ctor = nvkm_fifo_event_ctor,
		nvkm_fifo_cevent_func = {
		.ctor = nvkm_fifo_cevent_ctor,
		};

		void
		nvkm_fifo_cevent(struct nvkm_fifo *fifo)
		{
		nvkm_event_send(&fifo->cevent, 1, 0, NULL, 0);
		}

		static void
		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,
		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);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -410,6 +410,6 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *func,
		base + user * chan->chid;
		chan->size = user;

		nvkm_event_send(&fifo->cevent, 1, 0, NULL, 0);
		nvkm_fifo_cevent(fifo);
		return 0;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		int nvkm_fifo_ctor(const struct nvkm_fifo_func , struct nvkm_device ,
		int index, int nr, 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_func {