diff --git a/drivers/gpu/nvgpu/os/linux/soc.c b/drivers/gpu/nvgpu/os/linux/soc.c
index fe76d3df6..5718f2fba 100644
--- a/drivers/gpu/nvgpu/os/linux/soc.c
+++ b/drivers/gpu/nvgpu/os/linux/soc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2021, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -81,26 +81,8 @@ static u64 nvgpu_tegra_hv_ipa_pa(struct gk20a *g, u64 ipa, u64 *pa_len)
 
 	err = hyp_read_ipa_pa_info(&info, platform->vmid, ipa);
 	if (err < 0) {
-#ifdef CONFIG_TEGRA_GK20A_NVHOST
-		/* WAR for bug 2096877
-		 * hyp_read_ipa_pa_info only looks up RAM mappings.
-		 * assume one to one IPA:PA mapping for syncpt aperture
-		 */
-		u64 start = g->syncpt_unit_base;
-		u64 end = g->syncpt_unit_base + g->syncpt_unit_size;
-		if ((ipa >= start) && (ipa < end)) {
-			pa = ipa;
-			nvgpu_log(g, gpu_dbg_map_v,
-				"ipa=%llx vmid=%d -> pa=%llx (SYNCPT)\n",
-				ipa, platform->vmid, pa);
-		} else {
-			nvgpu_err(g, "ipa=%llx translation failed vmid=%u err=%d",
-				ipa, platform->vmid, err);
-		}
-#else
 		nvgpu_err(g, "ipa=%llx translation failed vmid=%u err=%d",
 			ipa, platform->vmid, err);
-#endif
 	} else {
 		pa = info.base + info.offset;
 		if (pa_len != NULL) {