Merge "msm: npu: Don't wait for SHUTDOWN irq if NPU is not in FPC mode" (e1e0bd30) · Commits · e / devices / android_kernel_oneplus_sm7250

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) {