소스 검색

Merge branch 'CR6823_vdec_system_crash_smain.guo' into 'jh7110-devel'

CR6823:soft_3rdpart: vpu/jpu: use dma_sync_single_for_device for flush

See merge request sdk/soft_3rdpart!67
andy.hu 9 달 전
부모
커밋
df38e64fca
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      codaj12/jdi/linux/driver/jpu.c
  2. 2 2
      wave420l/code/vdi/linux/driver/venc.c
  3. 2 2
      wave511/code/vdi/linux/driver/vdec.c

+ 2 - 2
codaj12/jdi/linux/driver/jpu.c

@@ -202,8 +202,8 @@ static struct list_head s_inst_list_head = LIST_HEAD_INIT(s_inst_list_head);
 
 static void starfive_flush_dcache(phys_addr_t start, size_t len)
 {
-#ifdef ARCH_HAS_SYNC_DMA_FOR_CPU
-	dma_sync_single_for_cpu(jpu_dev, start, len, DMA_FROM_DEVICE);
+#ifdef ARCH_HAS_SYNC_DMA_FOR_DEVICE
+	dma_sync_single_for_device(jpu_dev, start, len, DMA_FROM_DEVICE);
 #else
 	sifive_ccache_flush_range(start, len);
 #endif

+ 2 - 2
wave420l/code/vdi/linux/driver/venc.c

@@ -353,8 +353,8 @@ static u32	s_vpu_reg_store[MAX_NUM_VPU_CORE][64];
 
 static void starfive_flush_dcache(phys_addr_t start, size_t len)
 {
-#ifdef ARCH_HAS_SYNC_DMA_FOR_CPU
-	dma_sync_single_for_cpu(vpu_dev, start, len, DMA_FROM_DEVICE);
+#ifdef ARCH_HAS_SYNC_DMA_FOR_DEVICE
+	dma_sync_single_for_device(vpu_dev, start, len, DMA_FROM_DEVICE);
 #else
 	sifive_ccache_flush_range(start, len);
 #endif

+ 2 - 2
wave511/code/vdi/linux/driver/vdec.c

@@ -474,8 +474,8 @@ static int vpu_freq_init(struct device *dev)
 
 static void starfive_flush_dcache(phys_addr_t start, size_t len)
 {
-#ifdef ARCH_HAS_SYNC_DMA_FOR_CPU
-	dma_sync_single_for_cpu(vpu_dev, start, len, DMA_FROM_DEVICE);
+#ifdef ARCH_HAS_SYNC_DMA_FOR_DEVICE
+	dma_sync_single_for_device(vpu_dev, start, len, DMA_FROM_DEVICE);
 #else
 	sifive_ccache_flush_range(start, len);
 #endif