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

Commit 23bfccd1 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Add the TWOPASSUSEWFI quirk on A6XX" into msm-4.9

parents 5ce9a6d7 85c8cee5

Documentation/devicetree/bindings/gpu/adreno.txt

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ Optional Properties: 
GPU Quirks:

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

				Signal the GPU to set Set TWOPASSUSEWFI bit in

				A5XX_PC_DBG_ECO_CNTL (5XX only)

				PC_DBG_ECO_CNTL (5XX and 6XX only)

- qcom,gpu-quirk-critical-packets:

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

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

drivers/gpu/msm/adreno.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
 * Adreno GPU quirks - control bits for various workarounds

 */



/* Set TWOPASSUSEWFI in PC_DBG_ECO_CNTL (5XX) */

/* Set TWOPASSUSEWFI in PC_DBG_ECO_CNTL (5XX/6XX) */

#define ADRENO_QUIRK_TWO_PASS_USE_WFI BIT(0)

/* Lock/unlock mutex to sync with the IOMMU */

#define ADRENO_QUIRK_IOMMU_SYNC BIT(1)

drivers/gpu/msm/adreno_a6xx.c

+4 −0
Original line number Diff line number Diff line
@@ -257,6 +257,10 @@ static void a6xx_start(struct adreno_device *adreno_dev) 
	kgsl_regwrite(device, A6XX_RBBM_INTERFACE_HANG_INT_CNTL,

					  (1 << 30) | 0x4000);



	/* Set TWOPASSUSEWFI in A6XX_PC_DBG_ECO_CNTL if requested */

	if (ADRENO_QUIRK(adreno_dev, ADRENO_QUIRK_TWO_PASS_USE_WFI))

		kgsl_regrmw(device, A6XX_PC_DBG_ECO_CNTL, 0, (1 << 8));



	a6xx_protect_init(adreno_dev);

}