drm/i915/guc: Move intel_guc_reserved_gtt_size to intel_wopcm_guc_size (9937e16b) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2831,7 +2831,7 @@ int i915_gem_init_ggtt(struct drm_i915_private *dev_priv)
		* why.
		*/
		ggtt->pin_bias = max_t(u32, I915_GTT_PAGE_SIZE,
		intel_guc_reserved_gtt_size(&dev_priv->guc));
		intel_wopcm_guc_size(&dev_priv->wopcm));

		ret = intel_vgt_balloon(dev_priv);
		if (ret)

+0 −17

Original line number	Diff line number	Diff line
		@@ -686,23 +686,6 @@ err:
		return vma;
		}

		/**
		* intel_guc_reserved_gtt_size()
		* @guc: intel_guc structure
		*
		* The GuC WOPCM mapping shadows the lower part of the GGTT, so if we are using
		* GuC we can't have any objects pinned in that region. This function returns
		* the size of the shadowed region.
		*
		* Returns:
		* 0 if GuC is not present or not in use.
		* Otherwise, the GuC WOPCM size.
		*/
		u32 intel_guc_reserved_gtt_size(struct intel_guc *guc)
		{
		return guc_to_i915(guc)->wopcm.guc.size;
		}

		int intel_guc_reserve_ggtt_top(struct intel_guc *guc)
		{
		struct drm_i915_private *i915 = guc_to_i915(guc);

+0 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,6 @@ int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
		int intel_guc_suspend(struct intel_guc *guc);
		int intel_guc_resume(struct intel_guc *guc);
		struct i915_vma intel_guc_allocate_vma(struct intel_guc guc, u32 size);
		u32 intel_guc_reserved_gtt_size(struct intel_guc *guc);
		int intel_guc_reserve_ggtt_top(struct intel_guc *guc);
		void intel_guc_release_ggtt_top(struct intel_guc *guc);

+15 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,21 @@ struct intel_wopcm {
		} guc;
		};

		/**
		* intel_wopcm_guc_size()
		* @wopcm: intel_wopcm structure
		*
		* Returns size of the WOPCM shadowed region.
		*
		* Returns:
		* 0 if GuC is not present or not in use.
		* Otherwise, the GuC WOPCM size.
		*/
		static inline u32 intel_wopcm_guc_size(struct intel_wopcm *wopcm)
		{
		return wopcm->guc.size;
		}

		void intel_wopcm_init_early(struct intel_wopcm *wopcm);
		int intel_wopcm_init(struct intel_wopcm *wopcm);
		int intel_wopcm_init_hw(struct intel_wopcm *wopcm);