Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b58a945 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Chris Wilson
Browse files

drm/i915: Propagate "_release" function name suffix down 



Replace mixed "_fini"/"_cleanup"/"_cleanup_hw" suffixes found in names
of functions called from i915_driver_release() with "_release" suffix
consistently.  This provides better code readability, especially
helpful when trying to work out which phase the code is in.

Functions names starting with "i915_driver_", i.e., those defined in
drivers/gpu/dri/i915/i915_drv.c, just have their "cleanup" or "fini"
parts of their names replaced with the "_release" suffix, while names
of functions coming from other source files have been suffixed with
"_driver_release" to avoid ambiguity with other possible .release entry
points.

v2: early_probe pairs better with late_release (Chris)
v3: fix typo in commit message (Joonas)

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190712112429.740-5-janusz.krzysztofik@linux.intel.com
parent f2db53f1

drivers/gpu/drm/i915/i915_drv.c

+17 −16
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static int i915_load_modeset_init(struct drm_device *dev) 
cleanup_gem:

	i915_gem_suspend(dev_priv);

	i915_gem_fini_hw(dev_priv);

	i915_gem_fini(dev_priv);

	i915_gem_driver_release(dev_priv);

cleanup_modeset:

	intel_modeset_cleanup(dev);

cleanup_irq:
@@ -968,10 +968,11 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv) 
}



/**

 * i915_driver_cleanup_early - cleanup the setup done in i915_driver_init_early()

 * i915_driver_late_release - cleanup the setup done in

 *			       i915_driver_init_early()

 * @dev_priv: device private

 */

static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv)

static void i915_driver_late_release(struct drm_i915_private *dev_priv)

{

	intel_irq_fini(dev_priv);

	intel_power_domains_cleanup(dev_priv);
@@ -1034,10 +1035,10 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) 
}



/**

 * i915_driver_cleanup_mmio - cleanup the setup done in i915_driver_init_mmio()

 * i915_driver_mmio_release - cleanup the setup done in i915_driver_init_mmio()

 * @dev_priv: device private

 */

static void i915_driver_cleanup_mmio(struct drm_i915_private *dev_priv)

static void i915_driver_mmio_release(struct drm_i915_private *dev_priv)

{

	intel_teardown_mchbar(dev_priv);

	intel_uncore_fini_mmio(&dev_priv->uncore);
@@ -1690,7 +1691,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
		pci_disable_msi(pdev);

	pm_qos_remove_request(&dev_priv->pm_qos);

err_ggtt:

	i915_ggtt_cleanup_hw(dev_priv);

	i915_ggtt_driver_release(dev_priv);

err_perf:

	i915_perf_fini(dev_priv);

	return ret;
@@ -1935,15 +1936,15 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


out_cleanup_hw:

	i915_driver_cleanup_hw(dev_priv);

	i915_ggtt_cleanup_hw(dev_priv);

	i915_ggtt_driver_release(dev_priv);



	/* Paranoia: make sure we have disabled everything before we exit. */

	intel_sanitize_gt_powersave(dev_priv);

out_cleanup_mmio:

	i915_driver_cleanup_mmio(dev_priv);

	i915_driver_mmio_release(dev_priv);

out_runtime_pm_put:

	enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);

	i915_driver_cleanup_early(dev_priv);

	i915_driver_late_release(dev_priv);

out_pci_disable:

	pci_disable_device(pdev);

out_fini:
@@ -2006,19 +2007,19 @@ static void i915_driver_release(struct drm_device *dev) 


	disable_rpm_wakeref_asserts(rpm);



	i915_gem_fini(dev_priv);

	i915_gem_driver_release(dev_priv);



	i915_ggtt_cleanup_hw(dev_priv);

	i915_ggtt_driver_release(dev_priv);



	/* Paranoia: make sure we have disabled everything before we exit. */

	intel_sanitize_gt_powersave(dev_priv);



	i915_driver_cleanup_mmio(dev_priv);

	i915_driver_mmio_release(dev_priv);



	enable_rpm_wakeref_asserts(rpm);

	intel_runtime_pm_cleanup(rpm);

	intel_runtime_pm_driver_release(rpm);



	i915_driver_cleanup_early(dev_priv);

	i915_driver_late_release(dev_priv);

	i915_driver_destroy(dev_priv);

}
@@ -2211,7 +2212,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) 
out:

	enable_rpm_wakeref_asserts(rpm);

	if (!dev_priv->uncore.user_forcewake.count)

		intel_runtime_pm_cleanup(rpm);

		intel_runtime_pm_driver_release(rpm);



	return ret;

}
@@ -2975,7 +2976,7 @@ static int intel_runtime_suspend(struct device *kdev) 
	}



	enable_rpm_wakeref_asserts(rpm);

	intel_runtime_pm_cleanup(rpm);

	intel_runtime_pm_driver_release(rpm);



	if (intel_uncore_arm_unclaimed_mmio_detection(&dev_priv->uncore))

		DRM_ERROR("Unclaimed access detected prior to suspending\n");

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2538,7 +2538,7 @@ void i915_gem_init_mmio(struct drm_i915_private *i915); 
int __must_check i915_gem_init(struct drm_i915_private *dev_priv);

int __must_check i915_gem_init_hw(struct drm_i915_private *dev_priv);

void i915_gem_fini_hw(struct drm_i915_private *dev_priv);

void i915_gem_fini(struct drm_i915_private *dev_priv);

void i915_gem_driver_release(struct drm_i915_private *dev_priv);

int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,

			   unsigned int flags, long timeout);

void i915_gem_suspend(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ void i915_gem_fini_hw(struct drm_i915_private *dev_priv) 
	i915_gem_drain_freed_objects(dev_priv);

}



void i915_gem_fini(struct drm_i915_private *dev_priv)

void i915_gem_driver_release(struct drm_i915_private *dev_priv)

{

	mutex_lock(&dev_priv->drm.struct_mutex);

	intel_engines_cleanup(dev_priv);

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -2851,10 +2851,10 @@ static void ggtt_cleanup_hw(struct i915_ggtt *ggtt) 
}



/**

 * i915_ggtt_cleanup_hw - Clean up GGTT hardware initialization

 * i915_ggtt_driver_release - Clean up GGTT hardware initialization

 * @i915: i915 device

 */

void i915_ggtt_cleanup_hw(struct drm_i915_private *i915)

void i915_ggtt_driver_release(struct drm_i915_private *i915)

{

	struct pagevec *pvec;

drivers/gpu/drm/i915/i915_gem_gtt.h

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv); 
void i915_ggtt_enable_guc(struct drm_i915_private *i915);

void i915_ggtt_disable_guc(struct drm_i915_private *i915);

int i915_init_ggtt(struct drm_i915_private *dev_priv);

void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv);

void i915_ggtt_driver_release(struct drm_i915_private *dev_priv);



int i915_ppgtt_init_hw(struct intel_gt *gt);