From ee55fc9efad1aa549962db692ba932007d47ee77 Mon Sep 17 00:00:00 2001 From: Yu Qiaowei Date: Wed, 31 May 2023 08:44:16 +0000 Subject: [PATCH] video: rockchip: rga3: fix compile errors on kernel-6.1 Signed-off-by: Yu Qiaowei Change-Id: I3b0de1f1da992975c13f99de7574ff0cd0865e25 --- drivers/video/rockchip/rga3/rga_dma_buf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/video/rockchip/rga3/rga_dma_buf.c b/drivers/video/rockchip/rga3/rga_dma_buf.c index 7459d9211a01..718010088d5a 100644 --- a/drivers/video/rockchip/rga3/rga_dma_buf.c +++ b/drivers/video/rockchip/rga3/rga_dma_buf.c @@ -209,6 +209,8 @@ static dma_addr_t rga_iommu_dma_alloc_iova(struct iommu_domain *domain, shift = iova_shift(iovad); iova_len = size >> shift; + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) /* * Freeing non-power-of-two-sized allocations back into the IOVA caches * will come back to bite us badly, so we have to waste a bit of space @@ -217,6 +219,7 @@ static dma_addr_t rga_iommu_dma_alloc_iova(struct iommu_domain *domain, */ if (iova_len < (1 << (IOVA_RANGE_CACHE_MAX_SIZE - 1))) iova_len = roundup_pow_of_two(iova_len); +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) dma_limit = min_not_zero(dma_limit, dev->bus_dma_limit);