Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3d5336 authored by Jilai Wang's avatar Jilai Wang
Browse files

msm: npu: Don't wait for SHUTDOWN irq if NPU is not in FPC mode 



If NPU fails to enter FPC mode due to watchdog or other errors,
don't wait for SHUTDOWN irq since it won't be triggered.

Change-Id: I72a3a3c7b5fdafb29bbd7164c59e439a029c61f6
Signed-off-by: default avatarJilai Wang <jilaiw@codeaurora.org>
parent edf7b9a5

drivers/media/platform/msm/npu/npu_mgr.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 */



/* -------------------------------------------------------------------------
@@ -424,7 +424,7 @@ static int disable_fw_nolock(struct npu_device *npu_dev) 
		msleep(500);

	}



	if (!host_ctx->auto_pil_disable) {

	if (!ret && !host_ctx->auto_pil_disable) {

		ret = wait_for_completion_timeout(

			&host_ctx->fw_shutdown_done, NW_RSC_TIMEOUT_MS);

		if (!ret) {