Commit a3f356b2 authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson

drm/i915: simplify i915_gem_init_early

i915_gem_init_early doesn't need to return anything.
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190927173409.31175-3-matthew.auld@intel.com
parent b178a3f6
...@@ -614,9 +614,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) ...@@ -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); intel_gt_init_early(&dev_priv->gt, dev_priv);
ret = i915_gem_init_early(dev_priv); i915_gem_init_early(dev_priv);
if (ret < 0)
goto err_gt;
/* This must be called before any calls to HAS_PCH_* */ /* This must be called before any calls to HAS_PCH_* */
intel_detect_pch(dev_priv); intel_detect_pch(dev_priv);
...@@ -638,7 +636,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) ...@@ -638,7 +636,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
err_gem: err_gem:
i915_gem_cleanup_early(dev_priv); i915_gem_cleanup_early(dev_priv);
err_gt:
intel_gt_driver_late_release(&dev_priv->gt); intel_gt_driver_late_release(&dev_priv->gt);
vlv_free_s0ix_state(dev_priv); vlv_free_s0ix_state(dev_priv);
err_workqueues: err_workqueues:
......
...@@ -2243,7 +2243,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, ...@@ -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); 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_cleanup_userptr(struct drm_i915_private *dev_priv);
void i915_gem_sanitize(struct drm_i915_private *i915); 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); 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(struct drm_i915_private *dev_priv);
int i915_gem_freeze_late(struct drm_i915_private *dev_priv); int i915_gem_freeze_late(struct drm_i915_private *dev_priv);
......
...@@ -1533,7 +1533,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915) ...@@ -1533,7 +1533,7 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)
i915_gem_init__objects(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; int err;
...@@ -1545,8 +1545,6 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv) ...@@ -1545,8 +1545,6 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv)
err = i915_gemfs_init(dev_priv); err = i915_gemfs_init(dev_priv);
if (err) if (err)
DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", 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) void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment