Skip to content

L
linux
Commit f9a3a827 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files
Options

drm/i915/display: remove explicit CNL handling from intel_combo_phy.c 

The only real platform with DISPLAY_VER == 10 is GLK, that doesn't have
combo phys. We don't need to handle CNL explicitly in
intel_combo_phy.c.

Remove code and rename functions/macros accordingly to use ICL prefix.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210728215946.1573015-5-lucas.demarchi@intel.com
parent 44bf1b73
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 86 deletions
drivers/gpu/drm/i915/display/intel_combo_phy.c
View file @ f9a3a827
...@@ -23,9 +23,9 @@ enum { ...@@ -23,9 +23,9 @@ enum {
PROCMON_1_05V_DOT_1, PROCMON_1_05V_DOT_1,
}; };
static const struct cnl_procmon { static const struct icl_procmon {
u32 dw1, dw9, dw10; u32 dw1, dw9, dw10;
} cnl_procmon_values[] = { } icl_procmon_values[] = {
[PROCMON_0_85V_DOT_0] = [PROCMON_0_85V_DOT_0] =
{ .dw1 = 0x00000000, .dw9 = 0x62AB67BB, .dw10 = 0x51914F96, }, { .dw1 = 0x00000000, .dw9 = 0x62AB67BB, .dw10 = 0x51914F96, },
[PROCMON_0_95V_DOT_0] = [PROCMON_0_95V_DOT_0] =
...@@ -38,15 +38,10 @@ static const struct cnl_procmon { ...@@ -38,15 +38,10 @@ static const struct cnl_procmon {
{ .dw1 = 0x00440000, .dw9 = 0x9A00AB25, .dw10 = 0x8AE38FF1, }, { .dw1 = 0x00440000, .dw9 = 0x9A00AB25, .dw10 = 0x8AE38FF1, },
}; };
/* static const struct icl_procmon *
* CNL has just one set of registers, while gen11 has a set for each combo PHY. icl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy)
* The CNL registers are equivalent to the gen11 PHY A registers, that's why we
* call the ICL macros even though the function has CNL on its name.
*/
static const struct cnl_procmon *
cnl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy)
{ {
const struct cnl_procmon *procmon; const struct icl_procmon *procmon;
u32 val; u32 val;
val = intel_de_read(dev_priv, ICL_PORT_COMP_DW3(phy)); val = intel_de_read(dev_priv, ICL_PORT_COMP_DW3(phy));
...@@ -55,32 +50,32 @@ cnl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy) ...@@ -55,32 +50,32 @@ cnl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy)
MISSING_CASE(val); MISSING_CASE(val);
fallthrough; fallthrough;
case VOLTAGE_INFO_0_85V | PROCESS_INFO_DOT_0: case VOLTAGE_INFO_0_85V | PROCESS_INFO_DOT_0:
procmon = &cnl_procmon_values[PROCMON_0_85V_DOT_0]; procmon = &icl_procmon_values[PROCMON_0_85V_DOT_0];
break; break;
case VOLTAGE_INFO_0_95V | PROCESS_INFO_DOT_0: case VOLTAGE_INFO_0_95V | PROCESS_INFO_DOT_0:
procmon = &cnl_procmon_values[PROCMON_0_95V_DOT_0]; procmon = &icl_procmon_values[PROCMON_0_95V_DOT_0];
break; break;
case VOLTAGE_INFO_0_95V | PROCESS_INFO_DOT_1: case VOLTAGE_INFO_0_95V | PROCESS_INFO_DOT_1:
procmon = &cnl_procmon_values[PROCMON_0_95V_DOT_1]; procmon = &icl_procmon_values[PROCMON_0_95V_DOT_1];
break; break;
case VOLTAGE_INFO_1_05V | PROCESS_INFO_DOT_0: case VOLTAGE_INFO_1_05V | PROCESS_INFO_DOT_0:
procmon = &cnl_procmon_values[PROCMON_1_05V_DOT_0]; procmon = &icl_procmon_values[PROCMON_1_05V_DOT_0];
break; break;
case VOLTAGE_INFO_1_05V | PROCESS_INFO_DOT_1: case VOLTAGE_INFO_1_05V | PROCESS_INFO_DOT_1:
procmon = &cnl_procmon_values[PROCMON_1_05V_DOT_1]; procmon = &icl_procmon_values[PROCMON_1_05V_DOT_1];
break; break;
} }
return procmon; return procmon;
} }
static void cnl_set_procmon_ref_values(struct drm_i915_private *dev_priv, static void icl_set_procmon_ref_values(struct drm_i915_private *dev_priv,
enum phy phy) enum phy phy)
{ {
const struct cnl_procmon *procmon; const struct icl_procmon *procmon;
u32 val; u32 val;
procmon = cnl_get_procmon_ref_values(dev_priv, phy); procmon = icl_get_procmon_ref_values(dev_priv, phy);
val = intel_de_read(dev_priv, ICL_PORT_COMP_DW1(phy)); val = intel_de_read(dev_priv, ICL_PORT_COMP_DW1(phy));
val &= ~((0xff << 16) | 0xff); val &= ~((0xff << 16) | 0xff);
...@@ -109,13 +104,13 @@ static bool check_phy_reg(struct drm_i915_private *dev_priv, ...@@ -109,13 +104,13 @@ static bool check_phy_reg(struct drm_i915_private *dev_priv,
return true; return true;
} }
static bool cnl_verify_procmon_ref_values(struct drm_i915_private *dev_priv, static bool icl_verify_procmon_ref_values(struct drm_i915_private *dev_priv,
enum phy phy) enum phy phy)
{ {
const struct cnl_procmon *procmon; const struct icl_procmon *procmon;
bool ret; bool ret;
procmon = cnl_get_procmon_ref_values(dev_priv, phy); procmon = icl_get_procmon_ref_values(dev_priv, phy);
ret = check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW1(phy), ret = check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW1(phy),
(0xff << 16) | 0xff, procmon->dw1); (0xff << 16) | 0xff, procmon->dw1);
...@@ -127,61 +122,6 @@ static bool cnl_verify_procmon_ref_values(struct drm_i915_private *dev_priv, ...@@ -127,61 +122,6 @@ static bool cnl_verify_procmon_ref_values(struct drm_i915_private *dev_priv,
return ret; return ret;
} }
static bool cnl_combo_phy_enabled(struct drm_i915_private *dev_priv)
{
return !(intel_de_read(dev_priv, CHICKEN_MISC_2) & CNL_COMP_PWR_DOWN) &&
(intel_de_read(dev_priv, CNL_PORT_COMP_DW0) & COMP_INIT);
}
static bool cnl_combo_phy_verify_state(struct drm_i915_private *dev_priv)
{
enum phy phy = PHY_A;
bool ret;
if (!cnl_combo_phy_enabled(dev_priv))
return false;
ret = cnl_verify_procmon_ref_values(dev_priv, phy);
ret &= check_phy_reg(dev_priv, phy, CNL_PORT_CL1CM_DW5,
CL_POWER_DOWN_ENABLE, CL_POWER_DOWN_ENABLE);
return ret;
}
static void cnl_combo_phys_init(struct drm_i915_private *dev_priv)
{
u32 val;
val = intel_de_read(dev_priv, CHICKEN_MISC_2);
val &= ~CNL_COMP_PWR_DOWN;
intel_de_write(dev_priv, CHICKEN_MISC_2, val);
/* Dummy PORT_A to get the correct CNL register from the ICL macro */
cnl_set_procmon_ref_values(dev_priv, PHY_A);
val = intel_de_read(dev_priv, CNL_PORT_COMP_DW0);
val |= COMP_INIT;
intel_de_write(dev_priv, CNL_PORT_COMP_DW0, val);
val = intel_de_read(dev_priv, CNL_PORT_CL1CM_DW5);
val |= CL_POWER_DOWN_ENABLE;
intel_de_write(dev_priv, CNL_PORT_CL1CM_DW5, val);
}
static void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv)
{
u32 val;
if (!cnl_combo_phy_verify_state(dev_priv))
drm_warn(&dev_priv->drm,
"Combo PHY HW state changed unexpectedly.\n");
val = intel_de_read(dev_priv, CHICKEN_MISC_2);
val |= CNL_COMP_PWR_DOWN;
intel_de_write(dev_priv, CHICKEN_MISC_2, val);
}
static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy) static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy)
{ {
/* /*
...@@ -291,7 +231,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, ...@@ -291,7 +231,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,
DCC_MODE_SELECT_CONTINUOSLY); DCC_MODE_SELECT_CONTINUOSLY);
} }
ret &= cnl_verify_procmon_ref_values(dev_priv, phy); ret &= icl_verify_procmon_ref_values(dev_priv, phy);
if (phy_is_master(dev_priv, phy)) { if (phy_is_master(dev_priv, phy)) {
ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy), ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy),
...@@ -415,7 +355,7 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv) ...@@ -415,7 +355,7 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv)
intel_de_write(dev_priv, ICL_PORT_PCS_DW1_GRP(phy), val); intel_de_write(dev_priv, ICL_PORT_PCS_DW1_GRP(phy), val);
} }
cnl_set_procmon_ref_values(dev_priv, phy); icl_set_procmon_ref_values(dev_priv, phy);
if (phy_is_master(dev_priv, phy)) { if (phy_is_master(dev_priv, phy)) {
val = intel_de_read(dev_priv, ICL_PORT_COMP_DW8(phy)); val = intel_de_read(dev_priv, ICL_PORT_COMP_DW8(phy));
...@@ -474,16 +414,10 @@ static void icl_combo_phys_uninit(struct drm_i915_private *dev_priv) ...@@ -474,16 +414,10 @@ static void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)
void intel_combo_phy_init(struct drm_i915_private *i915) void intel_combo_phy_init(struct drm_i915_private *i915)
{ {
if (DISPLAY_VER(i915) >= 11) icl_combo_phys_init(i915);
icl_combo_phys_init(i915);
else if (IS_CANNONLAKE(i915))
cnl_combo_phys_init(i915);
} }
void intel_combo_phy_uninit(struct drm_i915_private *i915) void intel_combo_phy_uninit(struct drm_i915_private *i915)
{ {
if (DISPLAY_VER(i915) >= 11) icl_combo_phys_uninit(i915);
icl_combo_phys_uninit(i915);
else if (IS_CANNONLAKE(i915))
cnl_combo_phys_uninit(i915);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7