diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index 8bea08ac1..d0b18c358 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -54,7 +54,6 @@ NVGPU_COMMON_CFLAGS		:=
 
 NVGPU_COMMON_CFLAGS		+=		\
 	-DCONFIG_TEGRA_GK20A_NVHOST		\
-	-DCONFIG_TEGRA_T19X_GRHOST		\
 	-DCONFIG_NVGPU_SUPPORT_TURING		\
 	-DCONFIG_TEGRA_GK20A_PMU=1		\
 	-DCONFIG_TEGRA_ACR=1			\
diff --git a/drivers/gpu/nvgpu/doxygen/Doxyfile.safety b/drivers/gpu/nvgpu/doxygen/Doxyfile.safety
index 6269713cc..dc9db8851 100644
--- a/drivers/gpu/nvgpu/doxygen/Doxyfile.safety
+++ b/drivers/gpu/nvgpu/doxygen/Doxyfile.safety
@@ -2045,7 +2045,6 @@ PREDEFINED            += NV_IS_COVERITY
 
 # Enable safety-related flags
 PREDEFINED            += CONFIG_TEGRA_GK20A_NVHOST
-PREDEFINED            += CONFIG_TEGRA_T19X_GRHOST
 PREDEFINED            += CONFIG_NVGPU_SUPPORT_TURING
 PREDEFINED            += CONFIG_TEGRA_GK20A_PMU
 PREDEFINED            += CONFIG_TEGRA_ACR
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
index 60df1e8f3..a76ba7578 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h
@@ -239,8 +239,6 @@ u32 nvgpu_nvhost_get_syncpt_client_managed(struct nvgpu_nvhost_dev
 	*nvgpu_syncpt_dev,
 	const char *syncpt_name);
 
-#ifdef CONFIG_TEGRA_T19X_GRHOST
-
 /**
  * @brief Initializes the address and size of memory mapped
  * sync point unit region(MSS).
@@ -271,22 +269,7 @@ u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id);
 #ifdef __KERNEL__
 int nvgpu_nvhost_syncpt_init(struct gk20a *g);
 #endif
-#else
-static inline int nvgpu_nvhost_get_syncpt_aperture(
-		struct nvgpu_nvhost_dev *nvgpu_syncpt_dev,
-		u64 *base, size_t *size)
-{
-	return -EINVAL;
-}
-static inline u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id)
-{
-	return 0;
-}
-static inline int nvgpu_nvhost_syncpt_init(struct gk20a *g)
-{
-	return 0;
-}
-#endif /* CONFIG_TEGRA_T19X_GRHOST */
+
 #else /* CONFIG_TEGRA_GK20A_NVHOST */
 /**
  * @brief Check if the gpu has access to syncpoints.
diff --git a/drivers/gpu/nvgpu/os/linux/nvhost.c b/drivers/gpu/nvgpu/os/linux/nvhost.c
index e1139ab5c..feb51ca09 100644
--- a/drivers/gpu/nvgpu/os/linux/nvhost.c
+++ b/drivers/gpu/nvgpu/os/linux/nvhost.c
@@ -237,7 +237,6 @@ void nvgpu_nvhost_remove_symlink(struct gk20a *g)
 	}
 }
 
-#ifdef CONFIG_TEGRA_T19X_GRHOST
 int nvgpu_nvhost_get_syncpt_aperture(
 		struct nvgpu_nvhost_dev *nvhost_dev,
 		u64 *base, size_t *size)
@@ -328,4 +327,3 @@ fail_sync:
 	nvgpu_set_enabled(g, NVGPU_HAS_SYNCPOINTS, false);
 	return err;
 }
-#endif