drm/i915/huc: Move firmware selection to init_early (2fe2d4e3) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_drv.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3234,6 +3234,9 @@ intel_info(const struct drm_i915_private *dev_priv)
	#define HAS_GUC_CT(dev_priv) ((dev_priv)->info.has_guc_ct)		#define HAS_GUC_CT(dev_priv) ((dev_priv)->info.has_guc_ct)
	#define HAS_GUC_UCODE(dev_priv) (HAS_GUC(dev_priv))		#define HAS_GUC_UCODE(dev_priv) (HAS_GUC(dev_priv))
	#define HAS_GUC_SCHED(dev_priv) (HAS_GUC(dev_priv))		#define HAS_GUC_SCHED(dev_priv) (HAS_GUC(dev_priv))

			/* For now, anything with a GuC has also HuC */
			#define HAS_HUC(dev_priv) (HAS_GUC(dev_priv))
	#define HAS_HUC_UCODE(dev_priv) (HAS_GUC(dev_priv))		#define HAS_HUC_UCODE(dev_priv) (HAS_GUC(dev_priv))

	#define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)		#define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)

drivers/gpu/drm/i915/intel_huc.c

+37 −23

Original line number	Original line	Diff line number	Diff line
	@@ -77,42 +77,56 @@ MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
	#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \		#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
	GLK_HUC_FW_MINOR, GLK_BLD_NUM)		GLK_HUC_FW_MINOR, GLK_BLD_NUM)

	/**		static void huc_fw_select(struct intel_uc_fw *huc_fw)
	* intel_huc_select_fw() - selects HuC firmware for loading
	* @huc: intel_huc struct
	*/
	void intel_huc_select_fw(struct intel_huc *huc)
	{		{
			struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
	struct drm_i915_private *dev_priv = huc_to_i915(huc);		struct drm_i915_private *dev_priv = huc_to_i915(huc);

	intel_uc_fw_init(&huc->fw, INTEL_UC_FW_TYPE_HUC);		GEM_BUG_ON(huc_fw->type != INTEL_UC_FW_TYPE_HUC);

			if (!HAS_HUC(dev_priv))
			return;

	if (i915_modparams.huc_firmware_path) {		if (i915_modparams.huc_firmware_path) {
	huc->fw.path = i915_modparams.huc_firmware_path;		huc_fw->path = i915_modparams.huc_firmware_path;
	huc->fw.major_ver_wanted = 0;		huc_fw->major_ver_wanted = 0;
	huc->fw.minor_ver_wanted = 0;		huc_fw->minor_ver_wanted = 0;
	} else if (IS_SKYLAKE(dev_priv)) {		} else if (IS_SKYLAKE(dev_priv)) {
	huc->fw.path = I915_SKL_HUC_UCODE;		huc_fw->path = I915_SKL_HUC_UCODE;
	huc->fw.major_ver_wanted = SKL_HUC_FW_MAJOR;		huc_fw->major_ver_wanted = SKL_HUC_FW_MAJOR;
	huc->fw.minor_ver_wanted = SKL_HUC_FW_MINOR;		huc_fw->minor_ver_wanted = SKL_HUC_FW_MINOR;
	} else if (IS_BROXTON(dev_priv)) {		} else if (IS_BROXTON(dev_priv)) {
	huc->fw.path = I915_BXT_HUC_UCODE;		huc_fw->path = I915_BXT_HUC_UCODE;
	huc->fw.major_ver_wanted = BXT_HUC_FW_MAJOR;		huc_fw->major_ver_wanted = BXT_HUC_FW_MAJOR;
	huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;		huc_fw->minor_ver_wanted = BXT_HUC_FW_MINOR;
	} else if (IS_KABYLAKE(dev_priv) \|\| IS_COFFEELAKE(dev_priv)) {		} else if (IS_KABYLAKE(dev_priv) \|\| IS_COFFEELAKE(dev_priv)) {
	huc->fw.path = I915_KBL_HUC_UCODE;		huc_fw->path = I915_KBL_HUC_UCODE;
	huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;
	huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;
	} else if (IS_GEMINILAKE(dev_priv)) {		} else if (IS_GEMINILAKE(dev_priv)) {
	huc->fw.path = I915_GLK_HUC_UCODE;		huc_fw->path = I915_GLK_HUC_UCODE;
	huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;		huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
	huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
	} else {		} else {
	DRM_ERROR("No HuC firmware known for platform with HuC!\n");		DRM_WARN("%s: No firmware known for this platform!\n",
	return;		intel_uc_fw_type_repr(huc_fw->type));
	}		}
	}		}

			/**
			* intel_huc_init_early() - initializes HuC struct
			* @huc: intel_huc struct
			*
			* On platforms with HuC selects firmware for uploading
			*/
			void intel_huc_init_early(struct intel_huc *huc)
			{
			struct intel_uc_fw *huc_fw = &huc->fw;

			intel_uc_fw_init(huc_fw, INTEL_UC_FW_TYPE_HUC);
			huc_fw_select(huc_fw);
			}

	/**		/**
	* huc_ucode_xfer() - DMA's the firmware		* huc_ucode_xfer() - DMA's the firmware
	* @dev_priv: the drm_i915_private device		* @dev_priv: the drm_i915_private device

drivers/gpu/drm/i915/intel_huc.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ struct intel_huc {
	/* HuC-specific additions */		/* HuC-specific additions */
	};		};

	void intel_huc_select_fw(struct intel_huc *huc);		void intel_huc_init_early(struct intel_huc *huc);
	void intel_huc_init_hw(struct intel_huc *huc);		void intel_huc_init_hw(struct intel_huc *huc);
	void intel_huc_auth(struct intel_huc *huc);		void intel_huc_auth(struct intel_huc *huc);

drivers/gpu/drm/i915/intel_uc.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -65,9 +65,6 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)

	/* Verify firmware version */		/* Verify firmware version */
	if (i915_modparams.enable_guc_loading) {		if (i915_modparams.enable_guc_loading) {
	if (HAS_HUC_UCODE(dev_priv))
	intel_huc_select_fw(&dev_priv->huc);

	if (intel_guc_fw_select(&dev_priv->guc))		if (intel_guc_fw_select(&dev_priv->guc))
	i915_modparams.enable_guc_loading = 0;		i915_modparams.enable_guc_loading = 0;
	}		}
	@@ -84,6 +81,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
	void intel_uc_init_early(struct drm_i915_private *dev_priv)		void intel_uc_init_early(struct drm_i915_private *dev_priv)
	{		{
	intel_guc_init_early(&dev_priv->guc);		intel_guc_init_early(&dev_priv->guc);
			intel_huc_init_early(&dev_priv->huc);
	}		}

	void intel_uc_init_fw(struct drm_i915_private *dev_priv)		void intel_uc_init_fw(struct drm_i915_private *dev_priv)

Admin message