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

Commit 6f3ef5dd authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: add always-on power wells instead of special casing them 



Instead of using a separate function to check whether a power domain is
is always on, add an always-on power well covering all these power
domains and do the usual get/put on these unconditionally. Since we
don't assign a .set handler for these the get/put won't have any effect
besides the adjusted refcount.

This makes the code more readable and provides debug info also on the
use of always-on power wells (once the relevant debugfs entry is added.)

v3: make is_always_on to be bool instead of a bit field (Paulo)

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c1ca727f

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ struct intel_ilk_power_mgmt { 
/* Power well structure for haswell */

struct i915_power_well {

	const char *name;

	bool always_on;

	/* power well enable/disable usage count */

	int count;

	unsigned long domains;

drivers/gpu/drm/i915/intel_pm.c

+13 −28
Original line number Diff line number Diff line
@@ -5608,25 +5608,6 @@ void intel_suspend_hw(struct drm_device *dev) 
		lpt_suspend_hw(dev);

}



static bool is_always_on_power_domain(struct drm_device *dev,

				      enum intel_display_power_domain domain)

{

	unsigned long always_on_domains;



	BUG_ON(BIT(domain) & ~POWER_DOMAIN_MASK);



	if (IS_BROADWELL(dev)) {

		always_on_domains = BDW_ALWAYS_ON_POWER_DOMAINS;

	} else if (IS_HASWELL(dev)) {

		always_on_domains = HSW_ALWAYS_ON_POWER_DOMAINS;

	} else {

		WARN_ON(1);

		return true;

	}



	return BIT(domain) & always_on_domains;

}



#define for_each_power_well(i, power_well, domain_mask, power_domains)	\

	for (i = 0;							\

	     i < (power_domains)->power_well_count &&			\
@@ -5666,15 +5647,15 @@ bool intel_display_power_enabled(struct drm_device *dev, 
	if (!HAS_POWER_WELL(dev))

		return true;



	if (is_always_on_power_domain(dev, domain))

		return true;



	power_domains = &dev_priv->power_domains;



	is_enabled = true;



	mutex_lock(&power_domains->lock);

	for_each_power_well_rev(i, power_well, BIT(domain), power_domains) {

		if (power_well->always_on)

			continue;



		if (!power_well->is_enabled(dev, power_well)) {

			is_enabled = false;

			break;
@@ -5776,9 +5757,6 @@ void intel_display_power_get(struct drm_device *dev, 
	if (!HAS_POWER_WELL(dev))

		return;



	if (is_always_on_power_domain(dev, domain))

		return;



	power_domains = &dev_priv->power_domains;



	mutex_lock(&power_domains->lock);
@@ -5798,9 +5776,6 @@ void intel_display_power_put(struct drm_device *dev, 
	if (!HAS_POWER_WELL(dev))

		return;



	if (is_always_on_power_domain(dev, domain))

		return;



	power_domains = &dev_priv->power_domains;



	mutex_lock(&power_domains->lock);
@@ -5840,6 +5815,11 @@ void i915_release_power_well(void) 
EXPORT_SYMBOL_GPL(i915_release_power_well);



static struct i915_power_well hsw_power_wells[] = {

	{

		.name = "always-on",

		.always_on = 1,

		.domains = HSW_ALWAYS_ON_POWER_DOMAINS,

	},

	{

		.name = "display",

		.domains = POWER_DOMAIN_MASK & ~HSW_ALWAYS_ON_POWER_DOMAINS,
@@ -5849,6 +5829,11 @@ static struct i915_power_well hsw_power_wells[] = { 
};



static struct i915_power_well bdw_power_wells[] = {

	{

		.name = "always-on",

		.always_on = 1,

		.domains = BDW_ALWAYS_ON_POWER_DOMAINS,

	},

	{

		.name = "display",

		.domains = POWER_DOMAIN_MASK & ~BDW_ALWAYS_ON_POWER_DOMAINS,