diff --git a/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch b/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch index 89f996a5405b7e5b94e8d551b7106331db51a161..2c11139899b4ba96617dbffb50fff907a7cba79f 100644 --- a/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch +++ b/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch @@ -35811,10 +35811,10 @@ index 000000000..cc71df808 +#endif diff --git a/drivers/hisilicon/gpu/utgard/linux/mali_internal_sync.h b/drivers/hisilicon/gpu/utgard/linux/mali_internal_sync.h new file mode 100644 -index 000000000..d396d7d03 +index 000000000..e359132f0 --- /dev/null +++ b/drivers/hisilicon/gpu/utgard/linux/mali_internal_sync.h -@@ -0,0 +1,191 @@ +@@ -0,0 +1,195 @@ +/* + * Copyright (C) 2012-2015, 2017 ARM Limited. All rights reserved. + * @@ -35900,6 +35900,9 @@ index 000000000..d396d7d03 +}; +#endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0) ++#define mali_internal_sync_fence sync_file ++#else +struct mali_internal_sync_fence { + struct file *file; + struct kref kref; @@ -35927,6 +35930,7 @@ index 000000000..d396d7d03 + struct dma_fence_cb cb; +#endif +}; ++#endif + +struct mali_internal_sync_fence_waiter; + @@ -64391,7 +64395,7 @@ index 40d7e98fc..0e3344cc7 struct mmc_cqe_ops { diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 4fdeccf22..69f24c3fd 100644 +index 374683e81..486f45ea3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2028,6 +2028,7 @@ struct net_device {