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

Commit 20e56dcd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Add quirk for masking out hang detect signals"

parents 69de2a09 15de18f3

Documentation/devicetree/bindings/gpu/adreno.txt

+3 −1
Original line number Diff line number Diff line
@@ -133,7 +133,9 @@ GPU Quirks: 
				A5XX_PC_DBG_ECO_CNTL (5XX only)

- qcom,gpu-quirk-critical-packets:

				Submit a set of critical PM4 packets when the GPU wakes up



- qcom,gpu-quirk-fault-detect-mask:

				Mask out RB1-3 activity signals from HW hang

				detection logic



The following properties are optional as collecting data via coresight might

not be supported for every chipset. The documentation for coresight

arch/arm/boot/dts/qcom/msm8996-v2.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, 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
@@ -418,6 +418,7 @@ 
	/* Quirks */

	qcom,gpu-quirk-two-pass-use-wfi;

	qcom,gpu-quirk-iommu-sync;

	qcom,gpu-quirk-fault-detect-mask;



	/* Power levels */

	qcom,gpu-pwrlevels {

arch/arm/boot/dts/qcom/msm8996-v3.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
	/* Quirks */

	qcom,gpu-quirk-two-pass-use-wfi;

	qcom,gpu-quirk-critical-packets;

	qcom,gpu-quirk-fault-detect-mask;



	qcom,gpu-pwrlevel-bins {

		#address-cells = <1>;

drivers/gpu/msm/adreno.c

+1 −0
Original line number Diff line number Diff line
@@ -799,6 +799,7 @@ static struct { 
	 { ADRENO_QUIRK_TWO_PASS_USE_WFI, "qcom,gpu-quirk-two-pass-use-wfi" },

	 { ADRENO_QUIRK_IOMMU_SYNC, "qcom,gpu-quirk-iommu-sync" },

	 { ADRENO_QUIRK_CRITICAL_PACKETS, "qcom,gpu-quirk-critical-packets" },

	 { ADRENO_QUIRK_FAULT_DETECT_MASK, "qcom,gpu-quirk-fault-detect-mask" },

};



static int adreno_of_get_power(struct adreno_device *adreno_dev,

drivers/gpu/msm/adreno.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ 
#define ADRENO_QUIRK_IOMMU_SYNC BIT(1)

/* Submit critical packets at GPU wake up */

#define ADRENO_QUIRK_CRITICAL_PACKETS BIT(2)

/* Mask out RB1-3 activity signals from HW hang detection logic */

#define ADRENO_QUIRK_FAULT_DETECT_MASK BIT(3)



/* Flags to control command packet settings */

#define KGSL_CMD_FLAGS_NONE             0