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

Commit 600f380e 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 qcom,gpu-quirk-disable-lmloadkill"

parents 7dbe274b d423bf32

Documentation/devicetree/bindings/gpu/adreno.txt

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ GPU Quirks: 
				detection logic

- qcom,gpu-quirk-dp2clockgating-disable:

				Disable RB sampler data path clock gating optimization

- qcom,gpu-quirk-lmloadkill-disable:

				Use register setting to disable local memory(LM) feature

				to avoid corner case error



KGSL Memory Pools:

- qcom,gpu-mempools:		Container for sets of GPU mempools.Multiple sets

drivers/gpu/msm/a5xx_reg.h

+2 −0
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ 
#define A5XX_PC_PERFCTR_PC_SEL_7            0xD17



/* HLSQ registers */

#define A5XX_HLSQ_DBG_ECO_CNTL		    0xE04

#define A5XX_HLSQ_ADDR_MODE_CNTL            0xE05

#define A5XX_HLSQ_PERFCTR_HLSQ_SEL_0        0xE10

#define A5XX_HLSQ_PERFCTR_HLSQ_SEL_1        0xE11
@@ -632,6 +633,7 @@ 
#define A5XX_VFD_PERFCTR_VFD_SEL_7          0xE57



/* VPC registers */

#define A5XX_VPC_DBG_ECO_CNTL		    0xE60

#define A5XX_VPC_ADDR_MODE_CNTL             0xE61

#define A5XX_VPC_PERFCTR_VPC_SEL_0          0xE64

#define A5XX_VPC_PERFCTR_VPC_SEL_1          0xE65

drivers/gpu/msm/adreno.c

+2 −0
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ static struct { 
	 { ADRENO_QUIRK_FAULT_DETECT_MASK, "qcom,gpu-quirk-fault-detect-mask" },

	 { ADRENO_QUIRK_DISABLE_RB_DP2CLOCKGATING,

			"qcom,gpu-quirk-dp2clockgating-disable" },

	 { ADRENO_QUIRK_DISABLE_LMLOADKILL,

			"qcom,gpu-quirk-lmloadkill-disable" },

};



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
@@ -123,6 +123,8 @@ 
#define ADRENO_QUIRK_FAULT_DETECT_MASK BIT(3)

/* Disable RB sampler datapath clock gating optimization */

#define ADRENO_QUIRK_DISABLE_RB_DP2CLOCKGATING BIT(4)

/* Disable local memory(LM) feature to avoid corner case error */

#define ADRENO_QUIRK_DISABLE_LMLOADKILL BIT(5)



/* Flags to control command packet settings */

#define KGSL_CMD_FLAGS_NONE             0

drivers/gpu/msm/adreno_a5xx.c

+10 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,16 @@ static void a5xx_start(struct adreno_device *adreno_dev) 


	}



	/*

	 * VPC corner case with local memory load kill leads to corrupt

	 * internal state. Normal Disable does not work for all a5x chips.

	 * So do the following setting to disable it.

	 */

	if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_DISABLE_LMLOADKILL)) {

		kgsl_regrmw(device, A5XX_VPC_DBG_ECO_CNTL, 0, 0x1 << 23);

		kgsl_regrmw(device, A5XX_HLSQ_DBG_ECO_CNTL, 0x1 << 18, 0);

	}



	a5xx_preemption_start(adreno_dev);

	a5xx_protect_init(adreno_dev);

}