korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 16:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Explicitly map broxton DPIO power wells to phys

Browse Source 
The mapping from the BXT_DPIO_CMN_* power wells to their respective phys
required a detour implemented in the bxt_power_well_to_phy() function.
Instead, embed that information directly into the power_well struct, by
resurrecting the data field.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/7fe97582fa08c7340ce6a3b6b0ea3e72a73182d7.1475770848.git-series.ander.conselvan.de.oliveira@intel.com
This commit is contained in:
Ander Conselvan de Oliveira 2016-10-06 19:22:15 +03:00
parent 01c3faa70b
commit 362624c9ba
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1324,6 +1324,11 @@ struct i915_power_well {
unsigned long domains; unsigned long domains;
/* unique identifier for this power well */ /* unique identifier for this power well */
unsigned long id; unsigned long id;
/*
* Arbitraty data associated with this power well. Platform and power
* well specific.
*/
unsigned long data;
const struct i915_power_well_ops *ops; const struct i915_power_well_ops *ops;
}; };

22
drivers/gpu/drm/i915/intel_runtime_pm.c
View File

@ -845,13 +845,6 @@ static void skl_power_well_disable(struct drm_i915_private *dev_priv,
skl_set_power_well(dev_priv, power_well, false); skl_set_power_well(dev_priv, power_well, false);
} }
static enum dpio_phy bxt_power_well_to_phy(struct i915_power_well *power_well)
{
enum skl_disp_power_wells power_well_id = power_well->id;
return power_well_id == BXT_DPIO_CMN_A ? DPIO_PHY1 : DPIO_PHY0;
}
static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv, static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well) struct i915_power_well *power_well)
{ {
@ -867,7 +860,7 @@ static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
intel_power_well_get(dev_priv, cmn_a_well); intel_power_well_get(dev_priv, cmn_a_well);
} }
bxt_ddi_phy_init(dev_priv, bxt_power_well_to_phy(power_well)); bxt_ddi_phy_init(dev_priv, power_well->data);
if (cmn_a_well) if (cmn_a_well)
intel_power_well_put(dev_priv, cmn_a_well); intel_power_well_put(dev_priv, cmn_a_well);
@ -876,14 +869,13 @@ static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv, static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well) struct i915_power_well *power_well)
{ {
bxt_ddi_phy_uninit(dev_priv, bxt_power_well_to_phy(power_well)); bxt_ddi_phy_uninit(dev_priv, power_well->data);
} }
static bool bxt_dpio_cmn_power_well_enabled(struct drm_i915_private *dev_priv, static bool bxt_dpio_cmn_power_well_enabled(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well) struct i915_power_well *power_well)
{ {
return bxt_ddi_phy_is_enabled(dev_priv, return bxt_ddi_phy_is_enabled(dev_priv, power_well->data);
bxt_power_well_to_phy(power_well));
} }
static void bxt_dpio_cmn_power_well_sync_hw(struct drm_i915_private *dev_priv, static void bxt_dpio_cmn_power_well_sync_hw(struct drm_i915_private *dev_priv,
@ -902,13 +894,11 @@ static void bxt_verify_ddi_phy_power_wells(struct drm_i915_private *dev_priv)
power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_A); power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_A);
if (power_well->count > 0) if (power_well->count > 0)
bxt_ddi_phy_verify_state(dev_priv, bxt_ddi_phy_verify_state(dev_priv, power_well->data);
bxt_power_well_to_phy(power_well));
power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_BC); power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_BC);
if (power_well->count > 0) if (power_well->count > 0)
bxt_ddi_phy_verify_state(dev_priv, bxt_ddi_phy_verify_state(dev_priv, power_well->data);
bxt_power_well_to_phy(power_well));
} }
static bool gen9_dc_off_power_well_enabled(struct drm_i915_private *dev_priv, static bool gen9_dc_off_power_well_enabled(struct drm_i915_private *dev_priv,
@ -2162,12 +2152,14 @@ static struct i915_power_well bxt_power_wells[] = {
.domains = BXT_DPIO_CMN_A_POWER_DOMAINS, .domains = BXT_DPIO_CMN_A_POWER_DOMAINS,
.ops = &bxt_dpio_cmn_power_well_ops, .ops = &bxt_dpio_cmn_power_well_ops,
.id = BXT_DPIO_CMN_A, .id = BXT_DPIO_CMN_A,
.data = DPIO_PHY1,
}, },
{ {
.name = "dpio-common-bc", .name = "dpio-common-bc",
.domains = BXT_DPIO_CMN_BC_POWER_DOMAINS, .domains = BXT_DPIO_CMN_BC_POWER_DOMAINS,
.ops = &bxt_dpio_cmn_power_well_ops, .ops = &bxt_dpio_cmn_power_well_ops,
.id = BXT_DPIO_CMN_BC, .id = BXT_DPIO_CMN_BC,
.data = DPIO_PHY0,
}, },
}; };