diff --git a/linux-5.10/rk3568_patch/kernel.patch b/linux-5.10/rk3568_patch/kernel.patch index 2ff0568a511b78936e4cca7c3ae7e69e324a856e..d53402b685d2f6123a0af4dce613c08eddd8c742 100755 --- a/linux-5.10/rk3568_patch/kernel.patch +++ b/linux-5.10/rk3568_patch/kernel.patch @@ -136589,7 +136589,7 @@ index bbbfa28b2..6c2299561 100644 }; static LIST_HEAD(heap_list); -@@ -49,20 +52,72 @@ static dev_t dma_heap_devt; +@@ -49,20 +52,70 @@ static dev_t dma_heap_devt; static struct class *dma_heap_class; static DEFINE_XARRAY_ALLOC(dma_heap_minors); @@ -136627,8 +136627,6 @@ index bbbfa28b2..6c2299561 100644 + if (fd_flags & ~DMA_HEAP_VALID_FD_FLAGS) + return ERR_PTR(-EINVAL); + -+ if (heap_flags & ~DMA_HEAP_VALID_HEAP_FLAGS) -+ return ERR_PTR(-EINVAL); /* * Allocations from all heaps have to begin * and end on page boundaries. @@ -136666,7 +136664,7 @@ index bbbfa28b2..6c2299561 100644 static int dma_heap_open(struct inode *inode, struct file *file) { -@@ -90,15 +145,9 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data) +@@ -90,15 +143,9 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data) if (heap_allocation->fd) return -EINVAL; @@ -136685,7 +136683,7 @@ index bbbfa28b2..6c2299561 100644 if (fd < 0) return fd; -@@ -191,6 +240,47 @@ void *dma_heap_get_drvdata(struct dma_heap *heap) +@@ -191,6 +238,47 @@ void *dma_heap_get_drvdata(struct dma_heap *heap) { return heap->priv; } @@ -136733,7 +136731,7 @@ index bbbfa28b2..6c2299561 100644 /** * dma_heap_get_name() - get heap name -@@ -203,11 +293,11 @@ const char *dma_heap_get_name(struct dma_heap *heap) +@@ -203,11 +291,11 @@ const char *dma_heap_get_name(struct dma_heap *heap) { return heap->name; } @@ -136747,7 +136745,7 @@ index bbbfa28b2..6c2299561 100644 unsigned int minor; int ret; -@@ -221,10 +311,18 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) +@@ -221,10 +309,18 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) return ERR_PTR(-EINVAL); } @@ -136766,7 +136764,7 @@ index bbbfa28b2..6c2299561 100644 heap->name = exp_info->name; heap->ops = exp_info->ops; heap->priv = exp_info->priv; -@@ -249,28 +347,20 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) +@@ -249,28 +345,20 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) goto err1; } @@ -136805,7 +136803,7 @@ index bbbfa28b2..6c2299561 100644 /* Add heap to the list */ list_add(&heap->list, &heap_list); -@@ -288,27 +378,88 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) +@@ -288,27 +376,88 @@ struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) kfree(heap); return err_ret; }