aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2020-01-15 06:34:22 +1000
committerBen Skeggs <bskeggs@redhat.com>2020-01-15 10:50:29 +1000
commitf09a3ee36bdc097d197e5188b6d0fd5354ddfa1a (patch)
tree6dee3b3ca4888a42b2ad6c9d9ca4f9faf8c74ede /drivers/gpu/drm/nouveau
parentdrm/nouveau/flcn/cmdq: move command generation to subdevs (diff)
downloadlinux-dev-f09a3ee36bdc097d197e5188b6d0fd5354ddfa1a.tar.xz
linux-dev-f09a3ee36bdc097d197e5188b6d0fd5354ddfa1a.zip
drm/nouveau/flcn/msgq: remove error handling for msg_queue_open(), it can't fail
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c b/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
index eb499b796fe5..ea3e7c73e990 100644
--- a/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
+++ b/drivers/gpu/drm/nouveau/nvkm/falcon/msgq.c
@@ -22,13 +22,12 @@
*/
#include "qmgr.h"
-static int
+static void
msg_queue_open(struct nvkm_msgqueue *priv, struct nvkm_msgqueue_queue *queue)
{
struct nvkm_falcon *falcon = priv->falcon;
mutex_lock(&queue->mutex);
queue->position = nvkm_falcon_rd32(falcon, queue->tail_reg);
- return 0;
}
static void
@@ -91,11 +90,7 @@ msg_queue_read(struct nvkm_msgqueue *priv, struct nvkm_msgqueue_queue *queue,
const struct nvkm_subdev *subdev = priv->falcon->owner;
int ret;
- ret = msg_queue_open(priv, queue);
- if (ret) {
- nvkm_error(subdev, "fail to open queue %d\n", queue->index);
- return ret;
- }
+ msg_queue_open(priv, queue);
if (msg_queue_empty(priv, queue)) {
ret = 0;