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

Commit f458ebbc authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Bikeshed rpm functions name a bit. 



- fini goes with init, so call it intel_power_domains_fini. While
  at it shovel some of the fini code that leaked out of it back in.

- give power_enabled functions the verb _is_ to make the meaning clearer.
  Also use a __ prefix instead of _unlocked to really discourage users.

- rename runtime_pm_init/fini to enable/disable since that's what they do.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9c065a7d

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) 
		}



		for_each_pipe(dev_priv, pipe) {

			if (!intel_display_power_enabled(dev_priv,

			if (!intel_display_power_is_enabled(dev_priv,

						POWER_DOMAIN_PIPE(pipe))) {

				seq_printf(m, "Pipe %c power disabled\n",

					   pipe_name(pipe));

drivers/gpu/drm/i915/i915_dma.c

+4 −8
Original line number Diff line number Diff line
@@ -1798,12 +1798,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (IS_GEN5(dev))

		intel_gpu_ips_init(dev_priv);



	intel_init_runtime_pm(dev_priv);

	intel_runtime_pm_enable(dev_priv);



	return 0;



out_power_well:

	intel_power_domains_remove(dev_priv);

	intel_power_domains_fini(dev_priv);

	drm_vblank_cleanup(dev);

out_gem_unload:

	WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
@@ -1846,15 +1846,11 @@ int i915_driver_unload(struct drm_device *dev) 
		return ret;

	}



	intel_fini_runtime_pm(dev_priv);

	intel_runtime_pm_disable(dev_priv);



	intel_gpu_ips_teardown();



	/* The i915.ko module is still not prepared to be loaded when

	 * the power well is not enabled, so just enable it in case

	 * we're going to unload/reload. */

	intel_display_set_init_power(dev_priv, true);

	intel_power_domains_remove(dev_priv);

	intel_power_domains_fini(dev_priv);



	i915_teardown_sysfs(dev);

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ struct ilk_wm_values { 
 *

 * Our driver uses the autosuspend delay feature, which means we'll only really

 * suspend if we stay with zero refcount for a certain amount of time. The

 * default value is currently very conservative (see intel_init_runtime_pm), but

 * default value is currently very conservative (see intel_runtime_pm_enable), but

 * it can be changed with the standard runtime PM files from sysfs.

 *

 * The irqs_disabled variable becomes true exactly after we disable the IRQs and

drivers/gpu/drm/i915/i915_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -3473,7 +3473,7 @@ static void gen8_irq_reset(struct drm_device *dev) 
	gen8_gt_irq_reset(dev_priv);



	for_each_pipe(dev_priv, pipe)

		if (intel_display_power_enabled(dev_priv,

		if (intel_display_power_is_enabled(dev_priv,

						   POWER_DOMAIN_PIPE(pipe)))

			GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);
@@ -3826,7 +3826,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) 
	dev_priv->de_irq_mask[PIPE_C] = ~de_pipe_masked;



	for_each_pipe(dev_priv, pipe)

		if (intel_display_power_enabled(dev_priv,

		if (intel_display_power_is_enabled(dev_priv,

				POWER_DOMAIN_PIPE(pipe)))

			GEN8_IRQ_INIT_NDX(DE_PIPE, pipe,

					  dev_priv->de_irq_mask[pipe],

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder, 
	u32 tmp;



	power_domain = intel_display_port_power_domain(encoder);

	if (!intel_display_power_enabled(dev_priv, power_domain))

	if (!intel_display_power_is_enabled(dev_priv, power_domain))

		return false;



	tmp = I915_READ(crt->adpa_reg);