]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: venus: hfi_parser: Ignore HEVC encoding for V1
authorStephan Gerhold <stephan@gerhold.net>
Mon, 9 Dec 2019 19:16:52 +0000 (20:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Apr 2020 14:11:52 +0000 (16:11 +0200)
[ Upstream commit c50cc6dc6c48300af63a6fbc71b647053c15fc80 ]

Some older MSM8916 Venus firmware versions also seem to indicate
support for encoding HEVC, even though they really can't.
This will lead to errors later because hfi_session_init() fails
in this case.

HEVC is already ignored for "dec_codecs", so add the same for
"enc_codecs" to make these old firmware versions work correctly.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/qcom/venus/hfi_parser.c

index 2293d936e49ca217883f5ee6d494f6469fc83a24..7f515a4b9bd1257152f87c3b17ec1cb046540aed 100644 (file)
@@ -181,6 +181,7 @@ static void parse_codecs(struct venus_core *core, void *data)
        if (IS_V1(core)) {
                core->dec_codecs &= ~HFI_VIDEO_CODEC_HEVC;
                core->dec_codecs &= ~HFI_VIDEO_CODEC_SPARK;
+               core->enc_codecs &= ~HFI_VIDEO_CODEC_HEVC;
        }
 }