Le dimanche 05 novembre 2023 à 16:55 +0000, Jonas Karlman a écrit : > Use bytesperline and buffer height to calculate the strides configured. > > This does not really change anything other than ensuring the > bytesperline that is signaled to userspace matches what is configured > in HW. > > Signed-off-by: Jonas Karlman <jonas@xxxxxxxxx> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@xxxxxxxxxxxxx> > --- > v4: > - No change > > v3: > - Remove unnecessary yuv_virstride += > > drivers/staging/media/rkvdec/rkvdec-h264.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c > index 4fc167b42cf0..7a1e76d423df 100644 > --- a/drivers/staging/media/rkvdec/rkvdec-h264.c > +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c > @@ -896,9 +896,9 @@ static void config_registers(struct rkvdec_ctx *ctx, > dma_addr_t rlc_addr; > dma_addr_t refer_addr; > u32 rlc_len; > - u32 hor_virstride = 0; > - u32 ver_virstride = 0; > - u32 y_virstride = 0; > + u32 hor_virstride; > + u32 ver_virstride; > + u32 y_virstride; > u32 yuv_virstride = 0; > u32 offset; > dma_addr_t dst_addr; > @@ -909,16 +909,16 @@ static void config_registers(struct rkvdec_ctx *ctx, > > f = &ctx->decoded_fmt; > dst_fmt = &f->fmt.pix_mp; > - hor_virstride = (sps->bit_depth_luma_minus8 + 8) * dst_fmt->width / 8; > - ver_virstride = round_up(dst_fmt->height, 16); > + hor_virstride = dst_fmt->plane_fmt[0].bytesperline; > + ver_virstride = dst_fmt->height; > y_virstride = hor_virstride * ver_virstride; > > if (sps->chroma_format_idc == 0) > yuv_virstride = y_virstride; > else if (sps->chroma_format_idc == 1) > - yuv_virstride += y_virstride + y_virstride / 2; > + yuv_virstride = y_virstride + y_virstride / 2; > else if (sps->chroma_format_idc == 2) > - yuv_virstride += 2 * y_virstride; > + yuv_virstride = 2 * y_virstride; > > reg = RKVDEC_Y_HOR_VIRSTRIDE(hor_virstride / 16) | > RKVDEC_UV_HOR_VIRSTRIDE(hor_virstride / 16) |
