Commit d353c3c3 authored by Yunfei Dong's avatar Yunfei Dong Committed by Hans Verkuil
Browse files

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: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarSebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent afaaf3a0

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

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int vdec_vp8_decode(void *h_vdec, struct mtk_vcodec_mem *bs, 
		       inst->frm_cnt, y_fb_dma, c_fb_dma, fb);



	inst->cur_fb = fb;

	dec->bs_dma = (unsigned long)bs->dma_addr;

	dec->bs_dma = (uint64_t)bs->dma_addr;

	dec->bs_sz = bs->size;

	dec->cur_y_fb_dma = y_fb_dma;

	dec->cur_c_fb_dma = c_fb_dma;

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

+2 −2
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ static int vdec_vp9_slice_setup_tile_buffer(struct vdec_vp9_slice_instance *inst 
	unsigned int mi_row;

	unsigned int mi_col;

	unsigned int offset;

	unsigned int pa;

	dma_addr_t pa;

	unsigned int size;

	struct vdec_vp9_slice_tiles *tiles;

	unsigned char *pos;
@@ -1109,7 +1109,7 @@ static int vdec_vp9_slice_setup_tile_buffer(struct vdec_vp9_slice_instance *inst 
	pos = va + offset;

	end = va + bs->size;

	/* truncated */

	pa = (unsigned int)bs->dma_addr + offset;

	pa = bs->dma_addr + offset;

	tb = instance->tile.va;

	for (i = 0; i < rows; i++) {

		for (j = 0; j < cols; j++) {