mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
media: verisilicon: Do not set context src/dst formats in reset functions
Setting context source and destination formats should only be done in hantro_set_fmt_out() and hantro_set_fmt_cap() after check that the targeted queue is not busy. Remove these calls from hantro_reset_encoded_fmt() and hantro_reset_raw_fmt() to clean the driver. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
960badda95
commit
db6f68b51e
1 changed files with 2 additions and 7 deletions
|
@ -382,13 +382,10 @@ hantro_reset_encoded_fmt(struct hantro_ctx *ctx)
|
||||||
|
|
||||||
vpu_fmt = hantro_get_default_fmt(ctx, true);
|
vpu_fmt = hantro_get_default_fmt(ctx, true);
|
||||||
|
|
||||||
if (ctx->is_encoder) {
|
if (ctx->is_encoder)
|
||||||
ctx->vpu_dst_fmt = vpu_fmt;
|
|
||||||
fmt = &ctx->dst_fmt;
|
fmt = &ctx->dst_fmt;
|
||||||
} else {
|
else
|
||||||
ctx->vpu_src_fmt = vpu_fmt;
|
|
||||||
fmt = &ctx->src_fmt;
|
fmt = &ctx->src_fmt;
|
||||||
}
|
|
||||||
|
|
||||||
hantro_reset_fmt(fmt, vpu_fmt);
|
hantro_reset_fmt(fmt, vpu_fmt);
|
||||||
fmt->width = vpu_fmt->frmsize.min_width;
|
fmt->width = vpu_fmt->frmsize.min_width;
|
||||||
|
@ -408,11 +405,9 @@ hantro_reset_raw_fmt(struct hantro_ctx *ctx)
|
||||||
raw_vpu_fmt = hantro_get_default_fmt(ctx, false);
|
raw_vpu_fmt = hantro_get_default_fmt(ctx, false);
|
||||||
|
|
||||||
if (ctx->is_encoder) {
|
if (ctx->is_encoder) {
|
||||||
ctx->vpu_src_fmt = raw_vpu_fmt;
|
|
||||||
raw_fmt = &ctx->src_fmt;
|
raw_fmt = &ctx->src_fmt;
|
||||||
encoded_fmt = &ctx->dst_fmt;
|
encoded_fmt = &ctx->dst_fmt;
|
||||||
} else {
|
} else {
|
||||||
ctx->vpu_dst_fmt = raw_vpu_fmt;
|
|
||||||
raw_fmt = &ctx->dst_fmt;
|
raw_fmt = &ctx->dst_fmt;
|
||||||
encoded_fmt = &ctx->src_fmt;
|
encoded_fmt = &ctx->src_fmt;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue