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

Commit 48a287ed authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Rename intel_power_domains_fini() to intel_power_domains_fini_hw() 



intel_power_domains_fini() rolls back what was done in
intel_power_domains_init_hw(), so rename and move it accordingly. This
allows us adding a cleanup function later for intel_power_domains_init()
in a cleaner way.

No functional change.

v2:
- Fix checkpatch error adding missing param name to function
  declaration. (Paulo)

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180806095843.13294-3-imre.deak@intel.com
parent ae9b06ca

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	intel_teardown_gmbus(dev_priv);

cleanup_csr:

	intel_csr_ucode_fini(dev_priv);

	intel_power_domains_fini(dev_priv);

	intel_power_domains_fini_hw(dev_priv);

	vga_switcheroo_unregister_client(pdev);

cleanup_vga_client:

	vga_client_register(pdev, NULL, NULL, NULL);
@@ -1462,7 +1462,7 @@ void i915_driver_unload(struct drm_device *dev) 
	i915_gem_fini(dev_priv);

	intel_fbc_cleanup_cfb(dev_priv);



	intel_power_domains_fini(dev_priv);

	intel_power_domains_fini_hw(dev_priv);



	i915_driver_cleanup_hw(dev_priv);

	i915_driver_cleanup_mmio(dev_priv);

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1948,8 +1948,8 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state); 


/* intel_runtime_pm.c */

int intel_power_domains_init(struct drm_i915_private *);

void intel_power_domains_fini(struct drm_i915_private *);

void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume);

void intel_power_domains_fini_hw(struct drm_i915_private *dev_priv);

void intel_power_domains_suspend(struct drm_i915_private *dev_priv);

void intel_power_domains_verify_state(struct drm_i915_private *dev_priv);

void bxt_display_core_init(struct drm_i915_private *dev_priv, bool resume);

drivers/gpu/drm/i915/intel_runtime_pm.c

+34 −35
Original line number Diff line number Diff line
@@ -2902,41 +2902,6 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) 
	return 0;

}



/**

 * intel_power_domains_fini - finalizes the power domain structures

 * @dev_priv: i915 device instance

 *

 * Finalizes the power domain structures for @dev_priv depending upon the

 * supported platform. This function also disables runtime pm and ensures that

 * the device stays powered up so that the driver can be reloaded.

 */

void intel_power_domains_fini(struct drm_i915_private *dev_priv)

{

	struct device *kdev = &dev_priv->drm.pdev->dev;



	/*

	 * 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.

	 * The following also reacquires the RPM reference the core passed

	 * to the driver during loading, which is dropped in

	 * intel_runtime_pm_enable(). We have to hand back the control of the

	 * device to the core with this reference held.

	 */

	intel_display_set_init_power(dev_priv, true);



	/* Remove the refcount we took to keep power well support disabled. */

	if (!i915_modparams.disable_power_well)

		intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);



	/*

	 * Remove the refcount we took in intel_runtime_pm_enable() in case

	 * the platform doesn't support runtime PM.

	 */

	if (!HAS_RUNTIME_PM(dev_priv))

		pm_runtime_put(kdev);

}



static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv)

{

	struct i915_power_domains *power_domains = &dev_priv->power_domains;
@@ -3576,6 +3541,40 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume) 
	power_domains->initializing = false;

}



/**

 * intel_power_domains_fini_hw - deinitialize hw power domain state

 * @dev_priv: i915 device instance

 *

 * De-initializes the display power domain HW state. It also ensures that the

 * device stays powered up so that the driver can be reloaded.

 */

void intel_power_domains_fini_hw(struct drm_i915_private *dev_priv)

{

	struct device *kdev = &dev_priv->drm.pdev->dev;



	/*

	 * 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.

	 * The following also reacquires the RPM reference the core passed

	 * to the driver during loading, which is dropped in

	 * intel_runtime_pm_enable(). We have to hand back the control of the

	 * device to the core with this reference held.

	 */

	intel_display_set_init_power(dev_priv, true);



	/* Remove the refcount we took to keep power well support disabled. */

	if (!i915_modparams.disable_power_well)

		intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);



	/*

	 * Remove the refcount we took in intel_runtime_pm_enable() in case

	 * the platform doesn't support runtime PM.

	 */

	if (!HAS_RUNTIME_PM(dev_priv))

		pm_runtime_put(kdev);

}



/**

 * intel_power_domains_suspend - suspend power domain state

 * @dev_priv: i915 device instance