diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-10 13:38:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-10 13:38:35 -0700 |
| commit | 9875c0beb8adaab602572b983fb59dbd761d5882 (patch) | |
| tree | 4df9cb3e0026bc2a2ba66ccb6fe571c54a09a00b /drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | |
| parent | fe5b5ef836c85fc687db4fa3548775fd363e25d4 (diff) | |
| parent | d353c3c34af08cfd4eaafc8c55f664eacec274ee (diff) | |
Merge tag 'media/v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- some fixes for mediatec vcodec encoder/decoder oopses
* tag 'media/v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: mediatek: vcodec: support 36 bits physical address
media: mediatek: vcodec: adding lock to protect encoder context list
media: mediatek: vcodec: adding lock to protect decoder context list
media: mediatek: vcodec: Fix oops when HEVC init fails
media: mediatek: vcodec: Handle VP9 superframe bitstream with 8 sub-frames
Diffstat (limited to 'drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c')
| -rw-r--r-- | drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c index cf48d09b78d7..eea709d93820 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c @@ -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++) { |