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

video: rockchip: vpu: Fix address translate error

Browse Source 
Some hardware need to translate scaling list table address to u32
address in register. The dma_addr_t on 64bit kernel will cause
overwriting to later register file.

Change-Id: Ib01d8e260b3e83dabafc13b3bfac02595faa6d63
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2018-12-03 17:39:50 +08:00
parent 187a6da61f
commit e1755f0a19
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/rockchip/vcodec/vcodec_service.c
View File

@@ -1016,17 +1016,18 @@ static int fill_scaling_list_pps(struct vpu_subdev_data *data,
if (scaling_fd > 0) {
int i = 0;
u32 val;
dma_addr_t tmp = vcodec_fd_to_iova(data, reg->session, reg,
scaling_fd, -1);
if (IS_ERR_VALUE(tmp))
return tmp;
tmp += scaling_offset;
tmp = cpu_to_le32(tmp);
val = cpu_to_le32(tmp);
/* Fill the scaling list address in each pps entries */
for (i = 0; i < count; i++, base += pps_info_size)
memcpy(pps + base, &tmp, sizeof(tmp));
memcpy(pps + base, &val, sizeof(val));
}
dma_buf_vunmap(dmabuf, vaddr);