Commit 5516263f authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Mauro Carvalho Chehab
Browse files

media: venus: hfi_venus: Sanitize venus_halt_axi() per-VPU-version 



Only IRIS2(_1) should enter the until-now-IS_V6() path and IRIS2_1
can be used instead of openly checking the number of VPP pipes.

Use VPU version comparison in both of these cases instead.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarStanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 6513d80e

drivers/media/platform/qcom/venus/hfi_venus.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -548,10 +548,10 @@ static int venus_halt_axi(struct venus_hfi_device *hdev) 
	u32 mask_val;

	u32 mask_val;

	int ret;

	int ret;





	if (IS_V6(hdev->core)) {

	if (IS_IRIS2(hdev->core) || IS_IRIS2_1(hdev->core)) {

		writel(0x3, cpu_cs_base + CPU_CS_X2RPMH_V6);

		writel(0x3, cpu_cs_base + CPU_CS_X2RPMH_V6);





		if (hdev->core->res->num_vpp_pipes == 1)

		if (IS_IRIS2_1(hdev->core))

			goto skip_aon_mvp_noc;

			goto skip_aon_mvp_noc;





		writel(0x1, aon_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL);

		writel(0x1, aon_base + AON_WRAPPER_MVP_NOC_LPI_CONTROL);