drm/i915: simplify i915_gem_init_early (a3f356b2) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_drv.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -614,9 +614,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)

		intel_gt_init_early(&dev_priv->gt, dev_priv);

		ret = i915_gem_init_early(dev_priv);
		if (ret < 0)
		goto err_gt;
		i915_gem_init_early(dev_priv);

		/* This must be called before any calls to HAS_PCH_* */
		intel_detect_pch(dev_priv);
		@@ -638,7 +636,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)

		err_gem:
		i915_gem_cleanup_early(dev_priv);
		err_gt:
		intel_gt_driver_late_release(&dev_priv->gt);
		vlv_free_s0ix_state(dev_priv);
		err_workqueues:

+1 −1

Original line number	Diff line number	Diff line
		@@ -2243,7 +2243,7 @@ int i915_getparam_ioctl(struct drm_device dev, void data,
		int i915_gem_init_userptr(struct drm_i915_private *dev_priv);
		void i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv);
		void i915_gem_sanitize(struct drm_i915_private *i915);
		int i915_gem_init_early(struct drm_i915_private *dev_priv);
		void i915_gem_init_early(struct drm_i915_private *dev_priv);
		void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);
		int i915_gem_freeze(struct drm_i915_private *dev_priv);
		int i915_gem_freeze_late(struct drm_i915_private *dev_priv);

+1 −3

Original line number	Diff line number	Diff line
		@@ -1533,7 +1533,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)
		i915_gem_init__objects(i915);
		}

		int i915_gem_init_early(struct drm_i915_private *dev_priv)
		void i915_gem_init_early(struct drm_i915_private *dev_priv)
		{
		int err;

		@@ -1545,8 +1545,6 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
		err = i915_gemfs_init(dev_priv);
		if (err)
		DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", err);

		return 0;
		}

		void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)