Mainly useful for catching all the callers in the previous patch.
Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
drivers/gpu/drm/i915/intel_pm.c | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5d5e57d..3396a55 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -977,8 +977,8 @@ struct i915_power_well_ops {
void (*disable)(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well);
/* Returns the hw enabled state. */
- bool (*is_enabled)(struct drm_i915_private *dev_priv,
- struct i915_power_well *power_well);
+ bool (*hw_state)(struct drm_i915_private *dev_priv,
+ struct i915_power_well *power_well);
};
/* Power well structure for haswell */
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 09a3677..a29ef24 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5538,8 +5538,8 @@ void intel_suspend_hw(struct drm_device *dev)
* enable it, so check if it's enabled and also check if we've requested it to
* be enabled.
*/
-static bool hsw_power_well_enabled(struct drm_i915_private *dev_priv,
- struct i915_power_well *power_well)
+static bool hsw_power_hw_state(struct drm_i915_private *dev_priv,
+ struct i915_power_well *power_well)
{
return I915_READ(HSW_PWR_WELL_DRIVER) ==
(HSW_PWR_WELL_ENABLE_REQUEST | HSW_PWR_WELL_STATE_ENABLED);
@@ -5716,8 +5716,8 @@ static void i9xx_always_on_power_well_noop(struct
drm_i915_private *dev_priv,
{
}
-static bool i9xx_always_on_power_well_enabled(struct drm_i915_private
*dev_priv,
- struct i915_power_well *power_well)
+static bool i9xx_always_on_power_hw_state(struct drm_i915_private *dev_priv,
+ struct i915_power_well *power_well)
{
return true;
}
@@ -5819,8 +5819,8 @@ static void vlv_power_well_disable(struct
drm_i915_private *dev_priv,
vlv_set_power_well(dev_priv, power_well, false);
}
-static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv,
- struct i915_power_well *power_well)
+static bool vlv_power_hw_state(struct drm_i915_private *dev_priv,
+ struct i915_power_well *power_well)
{
int power_well_id = power_well->data;
bool enabled = false;
@@ -5904,7 +5904,7 @@ static void vlv_display_power_well_disable(struct
drm_i915_private *dev_priv,
static void check_power_well_state(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well)
{
- bool enabled = power_well->ops->is_enabled(dev_priv, power_well);
+ bool enabled = power_well->ops->hw_state(dev_priv, power_well);
if (power_well->always_on || !i915.disable_power_well) {
if (!enabled)
@@ -6070,7 +6070,7 @@ static const struct i915_power_well_ops
i9xx_always_on_power_well_ops = {
.sync_hw = i9xx_always_on_power_well_noop,
.enable = i9xx_always_on_power_well_noop,
.disable = i9xx_always_on_power_well_noop,
- .is_enabled = i9xx_always_on_power_well_enabled,
+ .hw_state = i9xx_always_on_power_hw_state,
};
static struct i915_power_well i9xx_always_on_power_well[] = {
@@ -6086,7 +6086,7 @@ static const struct i915_power_well_ops
hsw_power_well_ops = {
.sync_hw = hsw_power_well_sync_hw,
.enable = hsw_power_well_enable,
.disable = hsw_power_well_disable,
- .is_enabled = hsw_power_well_enabled,
+ .hw_state = hsw_power_hw_state,
};
static struct i915_power_well hsw_power_wells[] = {
@@ -6121,14 +6121,14 @@ static const struct i915_power_well_ops
vlv_display_power_well_ops = {
.sync_hw = vlv_power_well_sync_hw,
.enable = vlv_display_power_well_enable,
.disable = vlv_display_power_well_disable,
- .is_enabled = vlv_power_well_enabled,
+ .hw_state = vlv_power_hw_state,
};
static const struct i915_power_well_ops vlv_dpio_power_well_ops = {
.sync_hw = vlv_power_well_sync_hw,
.enable = vlv_power_well_enable,
.disable = vlv_power_well_disable,
- .is_enabled = vlv_power_well_enabled,
+ .hw_state = vlv_power_hw_state,
};
static struct i915_power_well vlv_power_wells[] = {
--
1.8.4.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
