Merge "msm: kgsl: Don't skip gmufw preallocations during firmware read" (3f9631cc) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/msm/adreno_a6xx_gmu.c

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1174,8 +1174,7 @@ static int a6xx_gmu_load_firmware(struct kgsl_device *device)
	int ret, offset = 0;		int ret, offset = 0;

	/* GMU fw already saved and verified so do nothing new */		/* GMU fw already saved and verified so do nothing new */
	if (gmu->fw_image)		if (!gmu->fw_image) {
	return 0;

	if (a6xx_core->gmufw_name == NULL)		if (a6xx_core->gmufw_name == NULL)
	return -EINVAL;		return -EINVAL;
	@@ -1187,6 +1186,7 @@ static int a6xx_gmu_load_firmware(struct kgsl_device *device)
	a6xx_core->gmufw_name, ret);		a6xx_core->gmufw_name, ret);
	return ret;		return ret;
	}		}
			}

	/*		/*
	* Zero payload fw blocks contain meta data and are		* Zero payload fw blocks contain meta data and are