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

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



Replace the general IS_V6 checks with more specific VPU version checks.

Reviewed-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
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 5516263f

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

+2 −2
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ static irqreturn_t venus_isr(struct venus_core *core) 
	wrapper_base = hdev->core->wrapper_base;



	status = readl(wrapper_base + WRAPPER_INTR_STATUS);

	if (IS_V6(core)) {

	if (IS_IRIS2(core) || IS_IRIS2_1(core)) {

		if (status & WRAPPER_INTR_STATUS_A2H_MASK ||

		    status & WRAPPER_INTR_STATUS_A2HWD_MASK_V6 ||

		    status & CPU_CS_SCIACMDARG0_INIT_IDLE_MSG_MASK)
@@ -1121,7 +1121,7 @@ static irqreturn_t venus_isr(struct venus_core *core) 
			hdev->irq_status = status;

	}

	writel(1, cpu_cs_base + CPU_CS_A2HSOFTINTCLR);

	if (!IS_V6(core))

	if (!(IS_IRIS2(core) || IS_IRIS2_1(core)))

		writel(status, wrapper_base + WRAPPER_INTR_CLEAR);



	return IRQ_WAKE_THREAD;