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

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

Merge "msm: npu: Increase IOMMU mapping size to 4GB"

parents 2619febe c1071f7c

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

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ 
			<&apcs_glb2 6>;

		mbox-names = "glink", "smp2p";

		#mbox-cells = <1>;

		qcom,npubw-devs = <&npu_npu_ddr_bw>;

		qcom,npubw-dev-names = "ddr_bw";

		qcom,npubw-devs = <&npu_npu_ddr_bw>, <&npudsp_npu_ddr_bw>;

		qcom,npubw-dev-names = "ddr_bw", "dsp_ddr_bw";

		qcom,src-dst-ports = <MSM_BUS_MASTER_NPU MSM_BUS_SLAVE_EBI_CH0>;

		qcom,npu-pwrlevels {

			#address-cells = <1>;

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

+2 −2
Original line number Diff line number Diff line
@@ -3379,7 +3379,7 @@ 
		governor = "performance";

		qcom,src-dst-ports = <MSM_BUS_MASTER_NPU MSM_BUS_SLAVE_EBI_CH0>;

		operating-points-v2 = <&suspendable_ddr_bw_opp_table>;

		status = "disabled";

		status = "ok";

	};



	npudsp_npu_ddr_bwmon: qcom,npudsp-npu-ddr-bwmon@70300 {
@@ -3397,7 +3397,7 @@ 
		qcom,hw-timer-hz = <19200000>;

		qcom,target-dev = <&npudsp_npu_ddr_bw>;

		qcom,count-unit = <0x10000>;

		status = "disabled";

		status = "ok";

	};



	keepalive_opp_table: keepalive-opp-table {

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

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/of_platform.h>

#include <linux/poll.h>

#include <linux/regulator/consumer.h>

#include <linux/sizes.h>

#include <linux/thermal.h>

#include <linux/soc/qcom/llcc-qcom.h>

#include <soc/qcom/devfreq_devbw.h>
@@ -34,8 +35,8 @@ 
 */

#define CLASS_NAME              "npu"

#define DRIVER_NAME             "msm_npu"

#define DDR_MAPPED_START_ADDR   0x80000000

#define DDR_MAPPED_SIZE         0x60000000

#define DDR_MAPPED_START_ADDR   0x00000000

#define DDR_MAPPED_SIZE         (SZ_1G * 4ULL)



#define MBOX_OP_TIMEOUTMS 1000