diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2020-01-15 06:34:22 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2020-01-15 10:50:28 +1000 |
commit | 2baaffff977593cb1faee8e11d47bc72b1a26e40 (patch) | |
tree | 75f4858bbfaba1c5a0c63e2be7bf2399895d2acf | |
parent | 2e8a65973b9afeebbff5e8a8e51e7cdd14f745a7 (diff) |
drm/nouveau/flcn/cmdq: cmd_queue_push can't fail, remove error handling for it
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c b/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c index d32cc0d354ee..b91971e15cc9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c +++ b/drivers/gpu/drm/nouveau/nvkm/falcon/cmdq.c @@ -49,13 +49,12 @@ cmd_queue_has_room(struct nvkm_msgqueue *priv, return size <= free; } -static int +static void cmd_queue_push(struct nvkm_msgqueue *priv, struct nvkm_msgqueue_queue *queue, void *data, u32 size) { nvkm_falcon_load_dmem(priv->falcon, data, queue->position, size, 0); queue->position += ALIGN(size, QUEUE_ALIGNMENT); - return 0; } /* REWIND unit is always 0x00 */ @@ -64,17 +63,11 @@ cmd_queue_push(struct nvkm_msgqueue *priv, struct nvkm_msgqueue_queue *queue, static void cmd_queue_rewind(struct nvkm_msgqueue *priv, struct nvkm_msgqueue_queue *queue) { - const struct nvkm_subdev *subdev = priv->falcon->owner; struct nvkm_msgqueue_hdr cmd; - int err; cmd.unit_id = MSGQUEUE_UNIT_REWIND; cmd.size = sizeof(cmd); - err = cmd_queue_push(priv, queue, &cmd, cmd.size); - if (err) - nvkm_error(subdev, "queue %d rewind failed\n", queue->index); - else - nvkm_error(subdev, "queue %d rewinded\n", queue->index); + cmd_queue_push(priv, queue, &cmd, cmd.size); queue->position = queue->offset; } @@ -132,12 +125,7 @@ cmd_write(struct nvkm_msgqueue *priv, struct nvkm_msgqueue_hdr *cmd, return ret; } - ret = cmd_queue_push(priv, queue, cmd, cmd->size); - if (ret) { - nvkm_error(subdev, "pmu_queue_push failed\n"); - commit = false; - } - + cmd_queue_push(priv, queue, cmd, cmd->size); cmd_queue_close(priv, queue, commit); return ret; } |