|
@@ -602,12 +602,12 @@ static int tegra_vde_attach_dmabufs_to_frame(struct device *dev,
|
|
|
struct tegra_vde_h264_frame *src,
|
|
|
enum dma_data_direction dma_dir,
|
|
|
bool baseline_profile,
|
|
|
- size_t csize)
|
|
|
+ size_t lsize, size_t csize)
|
|
|
{
|
|
|
int err;
|
|
|
|
|
|
err = tegra_vde_attach_dmabuf(dev, src->y_fd,
|
|
|
- src->y_offset, csize * 4, SZ_256,
|
|
|
+ src->y_offset, lsize, SZ_256,
|
|
|
&frame->y_dmabuf_attachment,
|
|
|
&frame->y_addr,
|
|
|
&frame->y_sgt,
|
|
@@ -773,9 +773,11 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde,
|
|
|
enum dma_data_direction dma_dir;
|
|
|
dma_addr_t bitstream_data_addr;
|
|
|
dma_addr_t bsev_ptr;
|
|
|
+ size_t lsize, csize;
|
|
|
size_t bitstream_data_size;
|
|
|
unsigned int macroblocks_nb;
|
|
|
unsigned int read_bytes;
|
|
|
+ unsigned int cstride;
|
|
|
unsigned int i;
|
|
|
long timeout;
|
|
|
int ret, err;
|
|
@@ -814,6 +816,10 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde,
|
|
|
goto free_dpb_frames;
|
|
|
}
|
|
|
|
|
|
+ cstride = ALIGN(ctx.pic_width_in_mbs * 8, 16);
|
|
|
+ csize = cstride * ctx.pic_height_in_mbs * 8;
|
|
|
+ lsize = macroblocks_nb * 256;
|
|
|
+
|
|
|
for (i = 0; i < ctx.dpb_frames_nb; i++) {
|
|
|
ret = tegra_vde_validate_frame(dev, &frames[i]);
|
|
|
if (ret)
|
|
@@ -827,7 +833,7 @@ static int tegra_vde_ioctl_decode_h264(struct tegra_vde *vde,
|
|
|
ret = tegra_vde_attach_dmabufs_to_frame(dev, &dpb_frames[i],
|
|
|
&frames[i], dma_dir,
|
|
|
ctx.baseline_profile,
|
|
|
- macroblocks_nb * 64);
|
|
|
+ lsize, csize);
|
|
|
if (ret)
|
|
|
goto release_dpb_frames;
|
|
|
}
|