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

Commit aaa0be0e 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: Don't allocate memory for microcode if it is already allocated"

parents 5659ef2a f58533dd

drivers/gpu/msm/adreno.c

+4 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,10 @@ static int adreno_init(struct kgsl_device *device) 
	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	int ret;



	kgsl_pwrctrl_change_state(device, KGSL_STATE_INIT);

	ret = kgsl_pwrctrl_change_state(device, KGSL_STATE_INIT);

	if (ret)

		return ret;



	/*

	 * initialization only needs to be done once initially until

	 * device is shutdown

drivers/gpu/msm/adreno_a5xx.c

+18 −10
Original line number Diff line number Diff line
@@ -2472,17 +2472,25 @@ static int a5xx_microcode_read(struct adreno_device *adreno_dev) 
{

	int ret;



	if (adreno_dev->pm4.hostptr == NULL) {

		ret = _load_firmware(KGSL_DEVICE(adreno_dev),

			 adreno_dev->gpucore->pm4fw_name, &adreno_dev->pm4,

			 &adreno_dev->pm4_fw_size, &adreno_dev->pm4_fw_version);

				 adreno_dev->gpucore->pm4fw_name,

				 &adreno_dev->pm4,

				 &adreno_dev->pm4_fw_size,

				 &adreno_dev->pm4_fw_version);

		if (ret)

			return ret;

	}



	if (adreno_dev->pfp.hostptr == NULL) {

		ret = _load_firmware(KGSL_DEVICE(adreno_dev),

			 adreno_dev->gpucore->pfpfw_name, &adreno_dev->pfp,

			 &adreno_dev->pfp_fw_size, &adreno_dev->pfp_fw_version);

				 adreno_dev->gpucore->pfpfw_name,

				 &adreno_dev->pfp,

				 &adreno_dev->pfp_fw_size,

				 &adreno_dev->pfp_fw_version);

		if (ret)

			return ret;

	}



	ret = _load_gpmu_firmware(adreno_dev);

	if (ret)