diff --git a/patch/kernel/archive/rockchip64-6.10/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch b/patch/kernel/archive/rockchip64-6.10/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch deleted file mode 100644 index f28679eca..000000000 --- a/patch/kernel/archive/rockchip64-6.10/media-0001-dma-mapping-let-dma_alloc_noncontiguous-allow-DMA_AT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: amazingfate -Date: Fri, 3 Nov 2023 18:04:43 +0800 -Subject: dma-mapping: let dma_alloc_noncontiguous allow - DMA_ATTR_NO_KERNEL_MAPPING - ---- - kernel/dma/mapping.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c -index e323ca48f7f2..2468d0d25ca1 100644 ---- a/kernel/dma/mapping.c -+++ b/kernel/dma/mapping.c -@@ -649,7 +649,7 @@ struct sg_table *dma_alloc_noncontiguous(struct device *dev, size_t size, - const struct dma_map_ops *ops = get_dma_ops(dev); - struct sg_table *sgt; - -- if (WARN_ON_ONCE(attrs & ~DMA_ATTR_ALLOC_SINGLE_PAGES)) -+ if (WARN_ON_ONCE((attrs & ~DMA_ATTR_ALLOC_SINGLE_PAGES) && (attrs & ~(DMA_ATTR_ALLOC_SINGLE_PAGES | DMA_ATTR_NO_KERNEL_MAPPING)))) - return NULL; - if (WARN_ON_ONCE(gfp & __GFP_COMP)) - return NULL; --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.10/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch b/patch/kernel/archive/rockchip64-6.10/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch deleted file mode 100644 index 2df213922..000000000 --- a/patch/kernel/archive/rockchip64-6.10/media-0002-Enable-non-coherent-dst-bufs-for-Hantro-V4L2-driver.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: amazingfate -Date: Fri, 3 Nov 2023 18:07:04 +0800 -Subject: Enable non-coherent dst bufs for Hantro V4L2 driver - ---- - drivers/media/platform/verisilicon/hantro_drv.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c -index 423fc85d79ee..df093026da52 100644 ---- a/drivers/media/platform/verisilicon/hantro_drv.c -+++ b/drivers/media/platform/verisilicon/hantro_drv.c -@@ -245,6 +245,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq) - dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; - dst_vq->lock = &ctx->dev->vpu_mutex; - dst_vq->dev = ctx->dev->v4l2_dev.dev; -+ dst_vq->allow_cache_hints = 1; - - return vb2_queue_init(dst_vq); - } --- -Armbian - diff --git a/patch/kernel/archive/rockchip64-6.10/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch b/patch/kernel/archive/rockchip64-6.10/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch deleted file mode 100644 index 745b28d5a..000000000 --- a/patch/kernel/archive/rockchip64-6.10/media-0003-Enable-non-coherent-dst-bufs-for-Rkvdec-V4L2-driver.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: amazingfate -Date: Fri, 3 Nov 2023 18:07:24 +0800 -Subject: Enable non-coherent dst bufs for Rkvdec V4L2 driver - ---- - drivers/staging/media/rkvdec/rkvdec.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c -index 84a41792cb4b..b35f7e1b8a20 100644 ---- a/drivers/staging/media/rkvdec/rkvdec.c -+++ b/drivers/staging/media/rkvdec/rkvdec.c -@@ -755,6 +755,7 @@ static int rkvdec_queue_init(void *priv, - dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; - dst_vq->lock = &rkvdec->vdev_lock; - dst_vq->dev = rkvdec->v4l2_dev.dev; -+ dst_vq->allow_cache_hints = 1; - - return vb2_queue_init(dst_vq); - } --- -Armbian -