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

Commit abd094f1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents cdd33f8e 19cfb8ba

arch/arm64/boot/dts/qcom/atoll-npu.dtsi

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2019, The Linux Foundation.All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,8 +18,10 @@ 
			<0x99f0000 0x10000>,

			<0x9980000 0x10000>,

			<0x17c00000 0x10000>,

			<0x01f40000 0x40000>;

		reg-names = "tcm", "core", "cc", "apss_shared", "tcsr";

			<0x01f40000 0x40000>,

			<0x780000 0x7000>;

		reg-names = "tcm", "core", "cc", "apss_shared", "tcsr",

			"qfprom_physical";

		interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 585 IRQ_TYPE_EDGE_RISING>,

			<GIC_SPI 588 IRQ_TYPE_EDGE_RISING>,

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

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,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) {