Skip to content

Commit d353c3c

Browse files
yunfei-mtkHans Verkuil
authored andcommitted
media: mediatek: vcodec: support 36 bits physical address
The physical address on the MT8188 platform is larger than 32 bits, change the type from unsigned int to dma_addr_t to be able to access the high bits of the address. Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
1 parent afaaf3a commit d353c3c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ static int vdec_vp8_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
449449
inst->frm_cnt, y_fb_dma, c_fb_dma, fb);
450450

451451
inst->cur_fb = fb;
452-
dec->bs_dma = (unsigned long)bs->dma_addr;
452+
dec->bs_dma = (uint64_t)bs->dma_addr;
453453
dec->bs_sz = bs->size;
454454
dec->cur_y_fb_dma = y_fb_dma;
455455
dec->cur_c_fb_dma = c_fb_dma;

drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ static int vdec_vp9_slice_setup_tile_buffer(struct vdec_vp9_slice_instance *inst
10741074
unsigned int mi_row;
10751075
unsigned int mi_col;
10761076
unsigned int offset;
1077-
unsigned int pa;
1077+
dma_addr_t pa;
10781078
unsigned int size;
10791079
struct vdec_vp9_slice_tiles *tiles;
10801080
unsigned char *pos;
@@ -1109,7 +1109,7 @@ static int vdec_vp9_slice_setup_tile_buffer(struct vdec_vp9_slice_instance *inst
11091109
pos = va + offset;
11101110
end = va + bs->size;
11111111
/* truncated */
1112-
pa = (unsigned int)bs->dma_addr + offset;
1112+
pa = bs->dma_addr + offset;
11131113
tb = instance->tile.va;
11141114
for (i = 0; i < rows; i++) {
11151115
for (j = 0; j < cols; j++) {

0 commit comments

Comments
 (0)