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

Commit e026e3a9 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: Do not invoke loading of GPU ZAP shader"

parents 82868142 3e0fd3eb

drivers/gpu/msm/adreno_a5xx.c

+7 −0
Original line number Diff line number Diff line
@@ -2225,6 +2225,13 @@ static int a5xx_microcode_load(struct adreno_device *adreno_dev) 
	kgsl_regwrite(device, A5XX_CP_PFP_INSTR_BASE_HI,

				upper_32_bits(gpuaddr));



	/*

	 * Do not invoke to load zap shader if MMU does

	 * not support secure mode.

	 */

	if (!device->mmu.secured)

		return 0;



	/*

	 * Resume call to write the zap shader base address into the

	 * appropriate register,

drivers/gpu/msm/adreno_a6xx.c

+7 −0
Original line number Diff line number Diff line
@@ -853,6 +853,13 @@ static int a6xx_microcode_load(struct adreno_device *adreno_dev) 
	kgsl_regwrite(device, A6XX_CP_SQE_INSTR_BASE_HI,

				upper_32_bits(gpuaddr));



	/*

	 * Do not invoke to load zap shader if MMU does

	 * not support secure mode.

	 */

	if (!device->mmu.secured)

		return 0;



	/* Load the zap shader firmware through PIL if its available */

	if (adreno_dev->gpucore->zap_name && !adreno_dev->zap_loaded) {

		/*