drm/msm: allow zapfw to not be specified in gpulist (3522b4b2) · Commits · 戴 / test

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -79,9 +79,21 @@ static int zap_shader_load_mdt(struct msm_gpu gpu, const char fwname,
		ret = request_firmware_direct(&fw, fwname, gpu->dev->dev);
		if (ret)
		fw = ERR_PTR(ret);
		} else {
		} else if (fwname) {
		/* Request the MDT file from the default location: */
		fw = adreno_request_fw(to_adreno_gpu(gpu), fwname);
		} else {
		/*
		* For new targets, we require the firmware-name property,
		* if a zap-shader is required, rather than falling back
		* to a firmware name specified in gpulist.
		*
		* Because the firmware is signed with a (potentially)
		* device specific key, having the name come from gpulist
		* was a bad idea, and is only provided for backwards
		* compatibility for older targets.
		*/
		return -ENODEV;
		}

		if (IS_ERR(fw)) {
		@@ -170,14 +182,6 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid)
		return -EPROBE_DEFER;
		}

		/* Each GPU has a target specific zap shader firmware name to use */
		if (!adreno_gpu->info->zapfw) {
		zap_available = false;
		DRM_DEV_ERROR(&pdev->dev,
		"Zap shader firmware file not specified for this target\n");
		return -ENODEV;
		}

		return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid);
		}