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

drivers/gpu/msm/adreno_a6xx_gmu.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1538,12 +1538,13 @@ int a6xx_gmu_parse_fw(struct adreno_device *adreno_dev)
		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 = a6xx_gmu_process_prealloc(gmu, blk);

		if (ret)
		return ret;
		}
		}

		return 0;
		}