diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index 712ce483..201750f4 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -11,6 +11,7 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
+#include <linux/version.h>
 
 #include "bus.h"
 #include "dev.h"
@@ -338,7 +339,11 @@ static int host1x_device_match(struct device *dev, struct device_driver *drv)
 	return strcmp(dev_name(dev), drv->name) == 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+static int host1x_device_uevent(const struct device *dev,
+#else
 static int host1x_device_uevent(struct device *dev,
+#endif
 				struct kobj_uevent_env *env)
 {
 	struct device_node *np = dev->parent->of_node;
diff --git a/drivers/gpu/host1x/cdma.c b/drivers/gpu/host1x/cdma.c
index 582f0487..256fc395 100644
--- a/drivers/gpu/host1x/cdma.c
+++ b/drivers/gpu/host1x/cdma.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/kfifo.h>
 #include <linux/slab.h>
+#include <linux/version.h>
 #include <trace/events/host1x.h>
 
 #include "cdma.h"
@@ -105,7 +106,11 @@ static int host1x_pushbuffer_init(struct push_buffer *pb)
 
 		pb->dma = iova_dma_addr(&host1x->iova, alloc);
 		err = iommu_map(host1x->domain, pb->dma, pb->phys, size,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)
+				IOMMU_READ, GFP_KERNEL);
+#else
 				IOMMU_READ);
+#endif
 		if (err)
 			goto iommu_free_iova;
 	} else {