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

media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts 



The startup procedure shouldn't be started with interrupts masked, as that
may entail silent failures.

Kick off initialization only after the interrupts are unmasked.

Cc: stable@vger.kernel.org # v4.12+
Fixes: d96d3f30 ("[media] media: venus: hfi: add Venus HFI files")
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 6283e483

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

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ static int venus_boot_core(struct venus_hfi_device *hdev) 
	void __iomem *wrapper_base = hdev->core->wrapper_base;

	int ret = 0;



	writel(BIT(VIDC_CTRL_INIT_CTRL_SHIFT), cpu_cs_base + VIDC_CTRL_INIT);

	if (IS_V6(hdev->core)) {

		mask_val = readl(wrapper_base + WRAPPER_INTR_MASK);

		mask_val &= ~(WRAPPER_INTR_MASK_A2HWD_BASK_V6 |
@@ -464,6 +463,7 @@ static int venus_boot_core(struct venus_hfi_device *hdev) 
	writel(mask_val, wrapper_base + WRAPPER_INTR_MASK);

	writel(1, cpu_cs_base + CPU_CS_SCIACMDARG3);



	writel(BIT(VIDC_CTRL_INIT_CTRL_SHIFT), cpu_cs_base + VIDC_CTRL_INIT);

	while (!ctrl_status && count < max_tries) {

		ctrl_status = readl(cpu_cs_base + CPU_CS_SCIACMDARG0);

		if ((ctrl_status & CPU_CS_SCIACMDARG0_ERROR_STATUS_MASK) == 4) {