drm/i915: Unexport i915_gem_init/fini_aliasing_ppgtt (bcc726be) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2814,7 +2814,7 @@ static void i915_gtt_color_adjust(const struct drm_mm_node *node,
		*end -= I915_GTT_PAGE_SIZE;
		}

		int i915_gem_init_aliasing_ppgtt(struct drm_i915_private *i915)
		static int init_aliasing_ppgtt(struct drm_i915_private *i915)
		{
		struct i915_ggtt *ggtt = &i915->ggtt;
		struct i915_hw_ppgtt *ppgtt;
		@@ -2854,7 +2854,7 @@ err_ppgtt:
		return err;
		}

		void i915_gem_fini_aliasing_ppgtt(struct drm_i915_private *i915)
		static void fini_aliasing_ppgtt(struct drm_i915_private *i915)
		{
		struct i915_ggtt *ggtt = &i915->ggtt;
		struct i915_hw_ppgtt *ppgtt;
		@@ -2924,7 +2924,7 @@ int i915_gem_init_ggtt(struct drm_i915_private *dev_priv)
		ggtt->vm.clear_range(&ggtt->vm, ggtt->vm.total - PAGE_SIZE, PAGE_SIZE);

		if (INTEL_PPGTT(dev_priv) == INTEL_PPGTT_ALIASING) {
		ret = i915_gem_init_aliasing_ppgtt(dev_priv);
		ret = init_aliasing_ppgtt(dev_priv);
		if (ret)
		goto err_appgtt;
		}
		@@ -2951,7 +2951,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)
		ggtt->vm.closed = true;

		mutex_lock(&dev_priv->drm.struct_mutex);
		i915_gem_fini_aliasing_ppgtt(dev_priv);
		fini_aliasing_ppgtt(dev_priv);

		list_for_each_entry_safe(vma, vn, &ggtt->vm.bound_list, vm_link)
		WARN_ON(i915_vma_unbind(vma));

+0 −3

Original line number	Diff line number	Diff line
		@@ -617,9 +617,6 @@ const struct intel_ppat_entry *
		intel_ppat_get(struct drm_i915_private *i915, u8 value);
		void intel_ppat_put(const struct intel_ppat_entry *entry);

		int i915_gem_init_aliasing_ppgtt(struct drm_i915_private *i915);
		void i915_gem_fini_aliasing_ppgtt(struct drm_i915_private *i915);

		int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv);
		int i915_ggtt_init_hw(struct drm_i915_private *dev_priv);
		int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv);