diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index 07bb393e2..dc35fbc0a 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -462,11 +462,8 @@ static int gk20a_submit_prepare_syncs(struct channel_gk20a *c,
 	}
 
 	/*
-	 * Optionally insert syncpt wait in the beginning of gpfifo submission
-	 * when user requested and the wait hasn't expired. Validate that the id
-	 * makes sense, elide if not. The only reason this isn't being
-	 * unceremoniously killed is to keep running some tests which trigger
-	 * this condition.
+	 * Optionally insert syncpt/semaphore wait in the beginning of gpfifo
+	 * submission when user requested and the wait hasn't expired.
 	 */
 	if (flags & NVGPU_SUBMIT_GPFIFO_FLAGS_FENCE_WAIT) {
 		int max_wait_cmds = c->deterministic ? 1 : 0;
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 25c576813..e94a112f4 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -58,10 +58,8 @@ static int gk20a_channel_syncpt_wait_syncpt(struct gk20a_channel_sync *s,
 	struct channel_gk20a *c = sp->c;
 	int err = 0;
 
-	if (!nvgpu_nvhost_syncpt_is_valid_pt_ext(sp->nvhost_dev, id)) {
-		nvgpu_warn(c->g, "invalid wait id in gpfifo submit, elided");
-		return 0;
-	}
+	if (!nvgpu_nvhost_syncpt_is_valid_pt_ext(sp->nvhost_dev, id))
+		return -EINVAL;
 
 	if (nvgpu_nvhost_syncpt_is_expired_ext(sp->nvhost_dev, id, thresh))
 		return 0;