Commit 848b365d authored by Chris Wilson's avatar Chris Wilson

drm/i915: Rename shrinker init/cleanup to match driver initialisation phase

Since the shrinker is registered and unregistered during
i915_driver_register and i915_driver_unregister, respectively, rename
the init/cleanup functions to match.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171123115338.10270-1-chris@chris-wilson.co.ukReviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 4e90a6e2
...@@ -1215,7 +1215,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) ...@@ -1215,7 +1215,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
i915_gem_shrinker_init(dev_priv); i915_gem_shrinker_register(dev_priv);
i915_pmu_register(dev_priv); i915_pmu_register(dev_priv);
/* /*
...@@ -1277,7 +1277,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv) ...@@ -1277,7 +1277,7 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
i915_guc_log_unregister(dev_priv); i915_guc_log_unregister(dev_priv);
drm_dev_unregister(&dev_priv->drm); drm_dev_unregister(&dev_priv->drm);
i915_gem_shrinker_cleanup(dev_priv); i915_gem_shrinker_unregister(dev_priv);
} }
/** /**
......
...@@ -3921,8 +3921,8 @@ unsigned long i915_gem_shrink(struct drm_i915_private *dev_priv, ...@@ -3921,8 +3921,8 @@ unsigned long i915_gem_shrink(struct drm_i915_private *dev_priv,
#define I915_SHRINK_ACTIVE 0x8 #define I915_SHRINK_ACTIVE 0x8
#define I915_SHRINK_VMAPS 0x10 #define I915_SHRINK_VMAPS 0x10
unsigned long i915_gem_shrink_all(struct drm_i915_private *dev_priv); unsigned long i915_gem_shrink_all(struct drm_i915_private *dev_priv);
void i915_gem_shrinker_init(struct drm_i915_private *dev_priv); void i915_gem_shrinker_register(struct drm_i915_private *dev_priv);
void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv); void i915_gem_shrinker_unregister(struct drm_i915_private *dev_priv);
/* i915_gem_tiling.c */ /* i915_gem_tiling.c */
......
...@@ -494,12 +494,12 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr ...@@ -494,12 +494,12 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
} }
/** /**
* i915_gem_shrinker_init - Initialize i915 shrinker * i915_gem_shrinker_register - Register the i915 shrinker
* @dev_priv: i915 device * @dev_priv: i915 device
* *
* This function registers and sets up the i915 shrinker and OOM handler. * This function registers and sets up the i915 shrinker and OOM handler.
*/ */
void i915_gem_shrinker_init(struct drm_i915_private *dev_priv) void i915_gem_shrinker_register(struct drm_i915_private *dev_priv)
{ {
dev_priv->mm.shrinker.scan_objects = i915_gem_shrinker_scan; dev_priv->mm.shrinker.scan_objects = i915_gem_shrinker_scan;
dev_priv->mm.shrinker.count_objects = i915_gem_shrinker_count; dev_priv->mm.shrinker.count_objects = i915_gem_shrinker_count;
...@@ -515,12 +515,12 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv) ...@@ -515,12 +515,12 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)
} }
/** /**
* i915_gem_shrinker_cleanup - Clean up i915 shrinker * i915_gem_shrinker_unregister - Unregisters the i915 shrinker
* @dev_priv: i915 device * @dev_priv: i915 device
* *
* This function unregisters the i915 shrinker and OOM handler. * This function unregisters the i915 shrinker and OOM handler.
*/ */
void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv) void i915_gem_shrinker_unregister(struct drm_i915_private *dev_priv)
{ {
WARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier)); WARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));
WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier)); WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
......
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