diff --git a/configs/Makefile.config.embedded-linux b/configs/Makefile.config.embedded-linux
index 03844598..4a79184c 100644
--- a/configs/Makefile.config.embedded-linux
+++ b/configs/Makefile.config.embedded-linux
@@ -7,3 +7,4 @@ export NV_OOT_NVMAP_IN_EMBEDDED_LINUX=y
 subdir-ccflags-y += -DNV_CONFIG_NVMAP_IN_EMBEDDED_LINUX
 
 export NV_OOT_NVHOST_NATIVE_DIS=y
+export NV_OOT_NVHOST_DISABLE_LEGACY_IOCTL=y
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 040a5e67..a9c878a2 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -20,6 +20,11 @@ export CONFIG_TEGRA_DRM_NATIVE_DIS=y
 subdir-ccflags-y += -DCONFIG_TEGRA_DRM_NATIVE_DIS
 endif
 
+ifeq ($(NV_OOT_NVHOST_DISABLE_LEGACY_IOCTL),y)
+export CONFIG_TEGRA_DRM_DISABLE_LEGACY_IOCTL=y
+subdir-ccflags-y += -DCONFIG_TEGRA_DRM_DISABLE_LEGACY_IOCTL
+endif
+
 ifdef CONFIG_DRM
 obj-m += drm/tegra/
 endif
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 4fb594ac..295e78eb 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -412,6 +412,10 @@ static int tegra_syncpt_incr(struct drm_device *drm, void *data,
 	struct drm_tegra_syncpt_incr *args = data;
 	struct host1x_syncpt *sp;
 
+	/* Legacy IOCTL is not supported on tegra264 */
+	if (of_machine_is_compatible("nvidia,tegra264"))
+		return -EINVAL;
+
 	sp = host1x_syncpt_get_by_id_noref(host1x, args->id);
 	if (!sp)
 		return -EINVAL;