public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/nouveau/flcn/msgq: pass explicit message queue pointer to recv()

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2020-01-15 06:34:22 +10:00
parent d114a1393f
commit e1cc579898
9 changed files with 4 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvkm/core/falcon.h
View file

@ -73,4 +73,5 @@ void nvkm_falcon_msgq_del(struct nvkm_falcon_msgq **);
void nvkm_falcon_msgq_init(struct nvkm_falcon_msgq *,
u32 index, u32 offset, u32 size);
int nvkm_falcon_msgq_recv_initmsg(struct nvkm_falcon_msgq *, void *, u32 size);
void nvkm_falcon_msgq_recv(struct nvkm_falcon_msgq *);
#endif

1
drivers/gpu/drm/nouveau/include/nvkm/core/msgqueue.h
View file

@ -31,7 +31,6 @@ struct nvkm_msgqueue;
int nvkm_msgqueue_new(u32, struct nvkm_falcon *, const struct nvkm_secboot *,
struct nvkm_msgqueue **);
void nvkm_msgqueue_del(struct nvkm_msgqueue **);
void nvkm_msgqueue_recv(struct nvkm_msgqueue *);
/* useful if we run a NVIDIA-signed firmware */
void nvkm_msgqueue_write_cmdline(struct nvkm_msgqueue *, void *);

8
drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c
View file

@ -41,13 +41,7 @@ nvkm_sec2_recv(struct work_struct *work)
sec2->initmsg_received = true;
}
if (!sec2->queue) {
nvkm_warn(&sec2->engine.subdev,
"recv function called while no firmware set!\n");
return;
}
nvkm_msgqueue_recv(sec2->queue);
nvkm_falcon_msgq_recv(sec2->msgq);
}
static void

3
drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
View file

@ -160,8 +160,7 @@ nvkm_falcon_msgq_recv_initmsg(struct nvkm_falcon_msgq *msgq,
}
void
nvkm_msgqueue_process_msgs(struct nvkm_msgqueue *priv,
struct nvkm_msgqueue_queue *queue)
nvkm_falcon_msgq_recv(struct nvkm_falcon_msgq *queue)
{
/*
* We are invoked from a worker thread, so normally we have plenty of

13
drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c
View file

@ -77,19 +77,6 @@ nvkm_msgqueue_del(struct nvkm_msgqueue **queue)
}
}
void
nvkm_msgqueue_recv(struct nvkm_msgqueue *queue)
{
if (!queue->func || !queue->func->recv) {
const struct nvkm_subdev *subdev = queue->falcon->owner;
nvkm_warn(subdev, "missing msgqueue recv function\n");
return;
}
queue->func->recv(queue);
}
void
nvkm_msgqueue_ctor(const struct nvkm_msgqueue_func *func,
struct nvkm_falcon *falcon,

3
drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.h
View file

@ -67,7 +67,6 @@ struct nvkm_msgqueue_init_func {
struct nvkm_msgqueue_func {
const struct nvkm_msgqueue_init_func *init_func;
void (*dtor)(struct nvkm_msgqueue *);
void (*recv)(struct nvkm_msgqueue *queue);
};
/**
@ -114,8 +113,6 @@ struct nvkm_msgqueue {
void nvkm_msgqueue_ctor(const struct nvkm_msgqueue_func *, struct nvkm_falcon *,
struct nvkm_msgqueue *);
void nvkm_msgqueue_process_msgs(struct nvkm_msgqueue *,
struct nvkm_msgqueue_queue *);
int msgqueue_0137c63d_new(struct nvkm_falcon *, const struct nvkm_secboot *,
struct nvkm_msgqueue **);

8
drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue_0137c63d.c
View file

@ -40,12 +40,6 @@ struct msgqueue_0137bca5 {
container_of(container_of(q, struct msgqueue_0137c63d, base), \
struct msgqueue_0137bca5, base);
static void
msgqueue_0137c63d_process_msgs(struct nvkm_msgqueue *queue)
{
nvkm_msgqueue_process_msgs(queue, queue->falcon->owner->device->pmu->msgq);
}
/* Init unit */
static void
init_gen_cmdline(struct nvkm_msgqueue *queue, void *buf)
@ -87,7 +81,6 @@ msgqueue_0137c63d_dtor(struct nvkm_msgqueue *queue)
static const struct nvkm_msgqueue_func
msgqueue_0137c63d_func = {
.init_func = &msgqueue_0137c63d_init_func,
.recv = msgqueue_0137c63d_process_msgs,
.dtor = msgqueue_0137c63d_dtor,
};
@ -111,7 +104,6 @@ msgqueue_0137c63d_new(struct nvkm_falcon *falcon, const struct nvkm_secboot *sb,
static const struct nvkm_msgqueue_func
msgqueue_0137bca5_func = {
.init_func = &msgqueue_0137c63d_init_func,
.recv = msgqueue_0137c63d_process_msgs,
.dtor = msgqueue_0137c63d_dtor,
};

8
drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue_0148cdec.c
View file

@ -37,13 +37,6 @@ struct msgqueue_0148cdec {
#define msgqueue_0148cdec(q) \
container_of(q, struct msgqueue_0148cdec, base)
static void
msgqueue_0148cdec_process_msgs(struct nvkm_msgqueue *queue)
{
nvkm_msgqueue_process_msgs(queue, queue->falcon->owner->device->sec2->msgq);
}
static void
init_gen_cmdline(struct nvkm_msgqueue *queue, void *buf)
{
@ -73,7 +66,6 @@ msgqueue_0148cdec_dtor(struct nvkm_msgqueue *queue)
const struct nvkm_msgqueue_func
msgqueue_0148cdec_func = {
.init_func = &msgqueue_0148cdec_init_func,
.recv = msgqueue_0148cdec_process_msgs,
.dtor = msgqueue_0148cdec_dtor,
};

8
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c
View file

@ -135,13 +135,7 @@ gm20b_pmu_recv(struct nvkm_pmu *pmu)
pmu->initmsg_received = true;
}
if (!pmu->queue) {
nvkm_warn(&pmu->subdev,
"recv function called while no firmware set!\n");
return;
}
nvkm_msgqueue_recv(pmu->queue);
nvkm_falcon_msgq_recv(pmu->msgq);
}
static const struct nvkm_pmu_func