Merge "msm: kgsl: Check for gmu prealloc failure only in case of prealloc request" (52f0fc3b) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/msm/adreno_a6xx_gmu.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1211,12 +1211,13 @@ static int a6xx_gmu_load_firmware(struct kgsl_device *device)
		offset += sizeof(*blk);

		if (blk->type == GMU_BLK_TYPE_PREALLOC_REQ \|\|
		blk->type == GMU_BLK_TYPE_PREALLOC_PERSIST_REQ)
		blk->type == GMU_BLK_TYPE_PREALLOC_PERSIST_REQ) {
		ret = gmu_prealloc_req(device, blk);

		if (ret)
		return ret;
		}
		}

		/* Request any other cache ranges that might be required */
		return gmu_cache_finalize(device);