Merge "msm: kgsl: Don't re-allocate A6XX SQE firmware" (f73e225c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/msm/adreno_a6xx.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -678,9 +678,6 @@ static int _load_firmware(struct kgsl_device device, const char fwfile,
		}

		release_firmware(fw);

		ret = _load_gmu_firmware(device);

		return ret;
		}

		@@ -1567,9 +1564,18 @@ static int _load_gmu_firmware(struct kgsl_device *device)
		*/
		static int a6xx_microcode_read(struct adreno_device *adreno_dev)
		{
		return _load_firmware(KGSL_DEVICE(adreno_dev),
		adreno_dev->gpucore->sqefw_name,
		ADRENO_FW(adreno_dev, ADRENO_FW_SQE));
		int ret;
		struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
		struct adreno_firmware *sqe_fw = ADRENO_FW(adreno_dev, ADRENO_FW_SQE);

		if (sqe_fw->memdesc.hostptr == NULL) {
		ret = _load_firmware(device, adreno_dev->gpucore->sqefw_name,
		sqe_fw);
		if (ret)
		return ret;
		}

		return _load_gmu_firmware(device);
		}

		#define VBIF_RESET_ACK_TIMEOUT 100

+3 −1

Original line number	Diff line number	Diff line
		@@ -292,10 +292,12 @@ static inline int kgsl_allocate_global(struct kgsl_device *device,
		else {
		ret = kgsl_sharedmem_page_alloc_user(memdesc, (size_t) size);
		if (ret == 0) {
		if (kgsl_memdesc_map(memdesc) == NULL)
		if (kgsl_memdesc_map(memdesc) == NULL) {
		kgsl_sharedmem_free(memdesc);
		ret = -ENOMEM;
		}
		}
		}

		if (ret == 0)
		kgsl_mmu_add_global(device, memdesc, name);