shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

decoder: optimized flushing cache for lowmem & highmem. [2/2]

Browse Source 
PD#SWPL-3593

Problem:
the memory data might be discordant.

Solution:
modified the way of flush mem which from lowmem or highmem.

Verify:
x301

Change-Id: Id5c21322a6cd4bf11639bc4981b6c2995a42f2dd
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
This commit is contained in:
Nanxin Qin
2019-02-21 16:20:39 +08:00
committed by Dongjin Kim
parent 3a7f5b7dc2
commit 883ad964c0
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/vmh264.c
View File

@@ -7892,17 +7892,15 @@ static int ammvdec_h264_probe(struct platform_device *pdev)
tmpbuf = (char *)codec_mm_phys_to_virt(hw->cma_alloc_addr);
if (tmpbuf) {
memset(tmpbuf, 0, V_BUF_ADDR_OFFSET);
dma_sync_single_for_device(amports_get_dma_device(),
hw->cma_alloc_addr,
V_BUF_ADDR_OFFSET, DMA_TO_DEVICE);
codec_mm_dma_flush(tmpbuf,
V_BUF_ADDR_OFFSET,
DMA_TO_DEVICE);
} else {
tmpbuf = codec_mm_vmap(hw->cma_alloc_addr,
V_BUF_ADDR_OFFSET);
if (tmpbuf) {
memset(tmpbuf, 0, V_BUF_ADDR_OFFSET);
dma_sync_single_for_device(
amports_get_dma_device(),
hw->cma_alloc_addr,
codec_mm_dma_flush(tmpbuf,
V_BUF_ADDR_OFFSET,
DMA_TO_DEVICE);
codec_mm_unmap_phyaddr(tmpbuf);

40
drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec_input.c
View File

@@ -75,8 +75,7 @@ static int copy_from_user_to_phyaddr(void *virts, const char __user *buf,
memset(p, 0, pading);
}
dma_sync_single_for_device(get_vdec_device(),
addr, size + pading, DMA_TO_DEVICE);
codec_mm_dma_flush(p, size + pading, DMA_TO_DEVICE);
return 0;
}
@@ -92,10 +91,8 @@ static int copy_from_user_to_phyaddr(void *virts, const char __user *buf,
return -EFAULT;
}
codec_mm_dma_flush(p, span, DMA_TO_DEVICE);
codec_mm_unmap_phyaddr(p);
dma_sync_single_for_device(get_vdec_device(),
addr, span, DMA_TO_DEVICE);
}
if (!remain)
@@ -115,11 +112,9 @@ static int copy_from_user_to_phyaddr(void *virts, const char __user *buf,
if (pading)
memset(p + remain, 0, pading);
codec_mm_dma_flush(p, remain + pading, DMA_TO_DEVICE);
codec_mm_unmap_phyaddr(p);
dma_sync_single_for_device(get_vdec_device(),
addr, remain + pading, DMA_TO_DEVICE);
return 0;
}
@@ -160,27 +155,30 @@ static int vframe_chunk_fill(struct vdec_input_s *input,
if (!block->is_mapped) {
p = codec_mm_vmap(block->start + wp, len);
memset(p, 0, len);
codec_mm_dma_flush(p, len, DMA_TO_DEVICE);
codec_mm_unmap_phyaddr(p);
} else
} else {
memset(p, 0, len);
dma_sync_single_for_device(get_vdec_device(),
block->start + wp,
len, DMA_TO_DEVICE);
codec_mm_dma_flush(p, len, DMA_TO_DEVICE);
}
if (chunk->pading_size > len) {
p = (u8 *)block->start_virt;
if (!block->is_mapped) {
p = codec_mm_vmap(block->start, count - len);
memset(p, 0, count - len);
p = codec_mm_vmap(block->start,
chunk->pading_size - len);
memset(p, 0, chunk->pading_size - len);
codec_mm_dma_flush(p,
chunk->pading_size - len,
DMA_TO_DEVICE);
codec_mm_unmap_phyaddr(p);
} else
memset(p, 0, count - len);
dma_sync_single_for_device(get_vdec_device(),
block->start,
chunk->pading_size - len, DMA_TO_DEVICE);
} else {
memset(p, 0, chunk->pading_size - len);
codec_mm_dma_flush(p,
chunk->pading_size - len,
DMA_TO_DEVICE);
}
}
}