Commit 22431189 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/flcn/msgq: explicitly create message queue from subdevs 



Code to interface with LS firmwares is being moved to the subdevs where it
belongs, rather than living in the common falcon code.

This is an incremental step towards that goal.

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

drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h

+7 −0
Original line number Diff line number Diff line
@@ -41,4 +41,11 @@ void nvkm_falcon_cmdq_del(struct nvkm_falcon_cmdq **); 
void nvkm_falcon_cmdq_init(struct nvkm_falcon_cmdq *,

			   u32 index, u32 offset, u32 size);

void nvkm_falcon_cmdq_fini(struct nvkm_falcon_cmdq *);



struct nvkm_falcon_msgq;

int nvkm_falcon_msgq_new(struct nvkm_falcon_qmgr *, const char *name,

			 struct nvkm_falcon_msgq **);

void nvkm_falcon_msgq_del(struct nvkm_falcon_msgq **);

void nvkm_falcon_msgq_init(struct nvkm_falcon_msgq *,

			   u32 index, u32 offset, u32 size);

#endif

drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <core/device.h>



#define nvkm_falcon_cmdq nvkm_msgqueue_queue

#define nvkm_falcon_msgq nvkm_msgqueue_queue



struct nvkm_subdev {

	const struct nvkm_subdev_func *func;

drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct nvkm_sec2 { 


	struct nvkm_falcon_qmgr *qmgr;

	struct nvkm_falcon_cmdq *cmdq;

	struct nvkm_falcon_msgq *msgq;

	struct nvkm_msgqueue *queue;

	struct work_struct work;

};

drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct nvkm_pmu { 
	struct nvkm_falcon_qmgr *qmgr;

	struct nvkm_falcon_cmdq *hpq;

	struct nvkm_falcon_cmdq *lpq;

	struct nvkm_falcon_msgq *msgq;

	struct nvkm_msgqueue *queue;



	struct {

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

+3 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ nvkm_sec2_dtor(struct nvkm_engine *engine) 
{

	struct nvkm_sec2 *sec2 = nvkm_sec2(engine);

	nvkm_msgqueue_del(&sec2->queue);

	nvkm_falcon_msgq_del(&sec2->msgq);

	nvkm_falcon_cmdq_del(&sec2->cmdq);

	nvkm_falcon_qmgr_del(&sec2->qmgr);

	nvkm_falcon_dtor(&sec2->falcon);
@@ -99,7 +100,8 @@ nvkm_sec2_new_(const struct nvkm_sec2_fwif *fwif, struct nvkm_device *device, 
		return ret;



	if ((ret = nvkm_falcon_qmgr_new(&sec2->falcon, &sec2->qmgr)) ||

	    (ret = nvkm_falcon_cmdq_new(sec2->qmgr, "cmdq", &sec2->cmdq)))

	    (ret = nvkm_falcon_cmdq_new(sec2->qmgr, "cmdq", &sec2->cmdq)) ||

	    (ret = nvkm_falcon_msgq_new(sec2->qmgr, "msgq", &sec2->msgq)))

		return ret;



	INIT_WORK(&sec2->work, nvkm_sec2_recv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE