diff --git a/src/freedreno/drm/msm_pipe.c b/src/freedreno/drm/msm_pipe.c
index 2eef493b5d4..ff9b6a3f2cc 100644
--- a/src/freedreno/drm/msm_pipe.c
+++ b/src/freedreno/drm/msm_pipe.c
@@ -117,12 +117,11 @@ static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp,
 	get_abs_timeout(&req.timeout, timeout);
 
 	ret = drmCommandWrite(dev->fd, DRM_MSM_WAIT_FENCE, &req, sizeof(req));
-	if (ret) {
+	if (ret && (ret != -ETIMEDOUT)) {
 		ERROR_MSG("wait-fence failed! %d (%s)", ret, strerror(errno));
-		return ret;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int open_submitqueue(struct fd_pipe *pipe, uint32_t prio)