mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
drm/i915/jsl: Split EHL/JSL platform info and PCI ids
Recently we came across requirement to identify EHL and JSL platform to program them differently. Thus Split the basic platform definition, macros, and PCI IDs to differentiate between EHL and JSL platforms. Also, IS_ELKHARTLAKE is replaced with IS_JSL_EHL everywhere. Changes since V1 : - Rebased to avoid merge conflicts - Added missed check for jasperlake in intel_uc_fw.c Cc : Matt Roper <matthew.d.roper@intel.com> Cc : Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201013192948.63470-1-tejaskumarx.surendrakumar.upadhyay@intel.com
This commit is contained in:
parent
055f8458d9
commit
24ea098b7c
16 changed files with 54 additions and 38 deletions
|
@ -455,7 +455,7 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)
|
||||||
intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), tmp);
|
intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), tmp);
|
||||||
|
|
||||||
/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */
|
/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */
|
||||||
if (IS_ELKHARTLAKE(dev_priv) || (INTEL_GEN(dev_priv) >= 12)) {
|
if (IS_JSL_EHL(dev_priv) || (INTEL_GEN(dev_priv) >= 12)) {
|
||||||
tmp = intel_de_read(dev_priv,
|
tmp = intel_de_read(dev_priv,
|
||||||
ICL_PORT_PCS_DW1_AUX(phy));
|
ICL_PORT_PCS_DW1_AUX(phy));
|
||||||
tmp &= ~LATENCY_OPTIM_MASK;
|
tmp &= ~LATENCY_OPTIM_MASK;
|
||||||
|
@ -612,7 +612,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(dev_priv)) {
|
if (IS_JSL_EHL(dev_priv)) {
|
||||||
for_each_dsi_phy(phy, intel_dsi->phys) {
|
for_each_dsi_phy(phy, intel_dsi->phys) {
|
||||||
tmp = intel_de_read(dev_priv, ICL_DPHY_CHKN(phy));
|
tmp = intel_de_read(dev_priv, ICL_DPHY_CHKN(phy));
|
||||||
tmp |= ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP;
|
tmp |= ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP;
|
||||||
|
|
|
@ -2588,7 +2588,7 @@ static int intel_compute_max_dotclk(struct drm_i915_private *dev_priv)
|
||||||
*/
|
*/
|
||||||
void intel_update_max_cdclk(struct drm_i915_private *dev_priv)
|
void intel_update_max_cdclk(struct drm_i915_private *dev_priv)
|
||||||
{
|
{
|
||||||
if (IS_ELKHARTLAKE(dev_priv)) {
|
if (IS_JSL_EHL(dev_priv)) {
|
||||||
if (dev_priv->cdclk.hw.ref == 24000)
|
if (dev_priv->cdclk.hw.ref == 24000)
|
||||||
dev_priv->max_cdclk_freq = 552000;
|
dev_priv->max_cdclk_freq = 552000;
|
||||||
else
|
else
|
||||||
|
@ -2829,7 +2829,7 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
|
||||||
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
|
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
|
||||||
dev_priv->display.calc_voltage_level = tgl_calc_voltage_level;
|
dev_priv->display.calc_voltage_level = tgl_calc_voltage_level;
|
||||||
dev_priv->cdclk.table = icl_cdclk_table;
|
dev_priv->cdclk.table = icl_cdclk_table;
|
||||||
} else if (IS_ELKHARTLAKE(dev_priv)) {
|
} else if (IS_JSL_EHL(dev_priv)) {
|
||||||
dev_priv->display.set_cdclk = bxt_set_cdclk;
|
dev_priv->display.set_cdclk = bxt_set_cdclk;
|
||||||
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
|
dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
|
||||||
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
|
dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
|
||||||
|
|
|
@ -188,7 +188,7 @@ static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy)
|
||||||
* PHY-B and may not even have instances of the register for the
|
* PHY-B and may not even have instances of the register for the
|
||||||
* other combo PHY's.
|
* other combo PHY's.
|
||||||
*/
|
*/
|
||||||
if (IS_ELKHARTLAKE(i915) ||
|
if (IS_JSL_EHL(i915) ||
|
||||||
IS_ROCKETLAKE(i915) ||
|
IS_ROCKETLAKE(i915) ||
|
||||||
IS_DG1(i915))
|
IS_DG1(i915))
|
||||||
return phy < PHY_C;
|
return phy < PHY_C;
|
||||||
|
@ -283,7 +283,7 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,
|
||||||
ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy),
|
ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy),
|
||||||
IREFGEN, IREFGEN);
|
IREFGEN, IREFGEN);
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(dev_priv)) {
|
if (IS_JSL_EHL(dev_priv)) {
|
||||||
if (ehl_vbt_ddi_d_present(dev_priv))
|
if (ehl_vbt_ddi_d_present(dev_priv))
|
||||||
expected_val = ICL_PHY_MISC_MUX_DDID;
|
expected_val = ICL_PHY_MISC_MUX_DDID;
|
||||||
|
|
||||||
|
@ -377,7 +377,7 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv)
|
||||||
* "internal" child devices.
|
* "internal" child devices.
|
||||||
*/
|
*/
|
||||||
val = intel_de_read(dev_priv, ICL_PHY_MISC(phy));
|
val = intel_de_read(dev_priv, ICL_PHY_MISC(phy));
|
||||||
if (IS_ELKHARTLAKE(dev_priv) && phy == PHY_A) {
|
if (IS_JSL_EHL(dev_priv) && phy == PHY_A) {
|
||||||
val &= ~ICL_PHY_MISC_MUX_DDID;
|
val &= ~ICL_PHY_MISC_MUX_DDID;
|
||||||
|
|
||||||
if (ehl_vbt_ddi_d_present(dev_priv))
|
if (ehl_vbt_ddi_d_present(dev_priv))
|
||||||
|
|
|
@ -2363,7 +2363,7 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp,
|
||||||
else
|
else
|
||||||
tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries);
|
tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries);
|
||||||
} else if (INTEL_GEN(dev_priv) == 11) {
|
} else if (INTEL_GEN(dev_priv) == 11) {
|
||||||
if (IS_ELKHARTLAKE(dev_priv))
|
if (IS_JSL_EHL(dev_priv))
|
||||||
ehl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
ehl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
||||||
else if (intel_phy_is_combo(dev_priv, phy))
|
else if (intel_phy_is_combo(dev_priv, phy))
|
||||||
icl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
icl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
||||||
|
@ -2544,7 +2544,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
|
||||||
|
|
||||||
if (INTEL_GEN(dev_priv) >= 12)
|
if (INTEL_GEN(dev_priv) >= 12)
|
||||||
ddi_translations = tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
ddi_translations = tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
||||||
else if (IS_ELKHARTLAKE(dev_priv))
|
else if (IS_JSL_EHL(dev_priv))
|
||||||
ddi_translations = ehl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
ddi_translations = ehl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
||||||
else
|
else
|
||||||
ddi_translations = icl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
ddi_translations = icl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
|
||||||
|
@ -3135,7 +3135,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
|
||||||
if (!intel_phy_is_combo(dev_priv, phy))
|
if (!intel_phy_is_combo(dev_priv, phy))
|
||||||
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
||||||
icl_pll_to_ddi_clk_sel(encoder, crtc_state));
|
icl_pll_to_ddi_clk_sel(encoder, crtc_state));
|
||||||
else if (IS_ELKHARTLAKE(dev_priv) && port >= PORT_C)
|
else if (IS_JSL_EHL(dev_priv) && port >= PORT_C)
|
||||||
/*
|
/*
|
||||||
* MG does not exist but the programming is required
|
* MG does not exist but the programming is required
|
||||||
* to ungate DDIC and DDID
|
* to ungate DDIC and DDID
|
||||||
|
@ -3184,7 +3184,7 @@ static void intel_ddi_clk_disable(struct intel_encoder *encoder)
|
||||||
|
|
||||||
if (INTEL_GEN(dev_priv) >= 11) {
|
if (INTEL_GEN(dev_priv) >= 11) {
|
||||||
if (!intel_phy_is_combo(dev_priv, phy) ||
|
if (!intel_phy_is_combo(dev_priv, phy) ||
|
||||||
(IS_ELKHARTLAKE(dev_priv) && port >= PORT_C))
|
(IS_JSL_EHL(dev_priv) && port >= PORT_C))
|
||||||
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
||||||
DDI_CLK_SEL_NONE);
|
DDI_CLK_SEL_NONE);
|
||||||
} else if (IS_CANNONLAKE(dev_priv)) {
|
} else if (IS_CANNONLAKE(dev_priv)) {
|
||||||
|
@ -4328,7 +4328,7 @@ void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
|
||||||
{
|
{
|
||||||
if (INTEL_GEN(dev_priv) >= 12 && crtc_state->port_clock > 594000)
|
if (INTEL_GEN(dev_priv) >= 12 && crtc_state->port_clock > 594000)
|
||||||
crtc_state->min_voltage_level = 2;
|
crtc_state->min_voltage_level = 2;
|
||||||
else if (IS_ELKHARTLAKE(dev_priv) && crtc_state->port_clock > 594000)
|
else if (IS_JSL_EHL(dev_priv) && crtc_state->port_clock > 594000)
|
||||||
crtc_state->min_voltage_level = 3;
|
crtc_state->min_voltage_level = 3;
|
||||||
else if (INTEL_GEN(dev_priv) >= 11 && crtc_state->port_clock > 594000)
|
else if (INTEL_GEN(dev_priv) >= 11 && crtc_state->port_clock > 594000)
|
||||||
crtc_state->min_voltage_level = 1;
|
crtc_state->min_voltage_level = 1;
|
||||||
|
@ -5199,7 +5199,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
|
||||||
encoder->hpd_pin = rkl_hpd_pin(dev_priv, port);
|
encoder->hpd_pin = rkl_hpd_pin(dev_priv, port);
|
||||||
else if (INTEL_GEN(dev_priv) >= 12)
|
else if (INTEL_GEN(dev_priv) >= 12)
|
||||||
encoder->hpd_pin = tgl_hpd_pin(dev_priv, port);
|
encoder->hpd_pin = tgl_hpd_pin(dev_priv, port);
|
||||||
else if (IS_ELKHARTLAKE(dev_priv))
|
else if (IS_JSL_EHL(dev_priv))
|
||||||
encoder->hpd_pin = ehl_hpd_pin(dev_priv, port);
|
encoder->hpd_pin = ehl_hpd_pin(dev_priv, port);
|
||||||
else if (IS_GEN(dev_priv, 11))
|
else if (IS_GEN(dev_priv, 11))
|
||||||
encoder->hpd_pin = icl_hpd_pin(dev_priv, port);
|
encoder->hpd_pin = icl_hpd_pin(dev_priv, port);
|
||||||
|
|
|
@ -7331,7 +7331,7 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)
|
||||||
return false;
|
return false;
|
||||||
else if (IS_ROCKETLAKE(dev_priv))
|
else if (IS_ROCKETLAKE(dev_priv))
|
||||||
return phy <= PHY_D;
|
return phy <= PHY_D;
|
||||||
else if (IS_ELKHARTLAKE(dev_priv))
|
else if (IS_JSL_EHL(dev_priv))
|
||||||
return phy <= PHY_C;
|
return phy <= PHY_C;
|
||||||
else if (INTEL_GEN(dev_priv) >= 11)
|
else if (INTEL_GEN(dev_priv) >= 11)
|
||||||
return phy <= PHY_B;
|
return phy <= PHY_B;
|
||||||
|
@ -7345,7 +7345,7 @@ bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)
|
||||||
return false;
|
return false;
|
||||||
else if (INTEL_GEN(dev_priv) >= 12)
|
else if (INTEL_GEN(dev_priv) >= 12)
|
||||||
return phy >= PHY_D && phy <= PHY_I;
|
return phy >= PHY_D && phy <= PHY_I;
|
||||||
else if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
|
else if (INTEL_GEN(dev_priv) >= 11 && !IS_JSL_EHL(dev_priv))
|
||||||
return phy >= PHY_C && phy <= PHY_F;
|
return phy >= PHY_C && phy <= PHY_F;
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
@ -7355,7 +7355,7 @@ enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port)
|
||||||
{
|
{
|
||||||
if (IS_ROCKETLAKE(i915) && port >= PORT_D)
|
if (IS_ROCKETLAKE(i915) && port >= PORT_D)
|
||||||
return (enum phy)port - 1;
|
return (enum phy)port - 1;
|
||||||
else if (IS_ELKHARTLAKE(i915) && port == PORT_D)
|
else if (IS_JSL_EHL(i915) && port == PORT_D)
|
||||||
return PHY_A;
|
return PHY_A;
|
||||||
|
|
||||||
return (enum phy)port;
|
return (enum phy)port;
|
||||||
|
@ -17125,7 +17125,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
|
||||||
intel_ddi_init(dev_priv, PORT_H);
|
intel_ddi_init(dev_priv, PORT_H);
|
||||||
intel_ddi_init(dev_priv, PORT_I);
|
intel_ddi_init(dev_priv, PORT_I);
|
||||||
icl_dsi_init(dev_priv);
|
icl_dsi_init(dev_priv);
|
||||||
} else if (IS_ELKHARTLAKE(dev_priv)) {
|
} else if (IS_JSL_EHL(dev_priv)) {
|
||||||
intel_ddi_init(dev_priv, PORT_A);
|
intel_ddi_init(dev_priv, PORT_A);
|
||||||
intel_ddi_init(dev_priv, PORT_B);
|
intel_ddi_init(dev_priv, PORT_B);
|
||||||
intel_ddi_init(dev_priv, PORT_C);
|
intel_ddi_init(dev_priv, PORT_C);
|
||||||
|
|
|
@ -332,7 +332,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
|
||||||
size = ARRAY_SIZE(cnl_rates);
|
size = ARRAY_SIZE(cnl_rates);
|
||||||
if (IS_GEN(dev_priv, 10))
|
if (IS_GEN(dev_priv, 10))
|
||||||
max_rate = cnl_max_source_rate(intel_dp);
|
max_rate = cnl_max_source_rate(intel_dp);
|
||||||
else if (IS_ELKHARTLAKE(dev_priv))
|
else if (IS_JSL_EHL(dev_priv))
|
||||||
max_rate = ehl_max_source_rate(intel_dp);
|
max_rate = ehl_max_source_rate(intel_dp);
|
||||||
else
|
else
|
||||||
max_rate = icl_max_source_rate(intel_dp);
|
max_rate = icl_max_source_rate(intel_dp);
|
||||||
|
|
|
@ -152,7 +152,7 @@ intel_combo_pll_enable_reg(struct drm_i915_private *i915,
|
||||||
struct intel_shared_dpll *pll)
|
struct intel_shared_dpll *pll)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(i915) && (pll->info->id == DPLL_ID_EHL_DPLL4))
|
if (IS_JSL_EHL(i915) && (pll->info->id == DPLL_ID_EHL_DPLL4))
|
||||||
return MG_PLL_ENABLE(0);
|
return MG_PLL_ENABLE(0);
|
||||||
|
|
||||||
return CNL_DPLL_ENABLE(pll->info->id);
|
return CNL_DPLL_ENABLE(pll->info->id);
|
||||||
|
@ -3551,7 +3551,7 @@ static bool icl_get_combo_phy_dpll(struct intel_atomic_state *state,
|
||||||
BIT(DPLL_ID_EHL_DPLL4) |
|
BIT(DPLL_ID_EHL_DPLL4) |
|
||||||
BIT(DPLL_ID_ICL_DPLL1) |
|
BIT(DPLL_ID_ICL_DPLL1) |
|
||||||
BIT(DPLL_ID_ICL_DPLL0);
|
BIT(DPLL_ID_ICL_DPLL0);
|
||||||
} else if (IS_ELKHARTLAKE(dev_priv) && port != PORT_A) {
|
} else if (IS_JSL_EHL(dev_priv) && port != PORT_A) {
|
||||||
dpll_mask =
|
dpll_mask =
|
||||||
BIT(DPLL_ID_EHL_DPLL4) |
|
BIT(DPLL_ID_EHL_DPLL4) |
|
||||||
BIT(DPLL_ID_ICL_DPLL1) |
|
BIT(DPLL_ID_ICL_DPLL1) |
|
||||||
|
@ -3853,7 +3853,7 @@ static bool icl_pll_get_hw_state(struct drm_i915_private *dev_priv,
|
||||||
hw_state->cfgcr1 = intel_de_read(dev_priv,
|
hw_state->cfgcr1 = intel_de_read(dev_priv,
|
||||||
TGL_DPLL_CFGCR1(id));
|
TGL_DPLL_CFGCR1(id));
|
||||||
} else {
|
} else {
|
||||||
if (IS_ELKHARTLAKE(dev_priv) && id == DPLL_ID_EHL_DPLL4) {
|
if (IS_JSL_EHL(dev_priv) && id == DPLL_ID_EHL_DPLL4) {
|
||||||
hw_state->cfgcr0 = intel_de_read(dev_priv,
|
hw_state->cfgcr0 = intel_de_read(dev_priv,
|
||||||
ICL_DPLL_CFGCR0(4));
|
ICL_DPLL_CFGCR0(4));
|
||||||
hw_state->cfgcr1 = intel_de_read(dev_priv,
|
hw_state->cfgcr1 = intel_de_read(dev_priv,
|
||||||
|
@ -3902,7 +3902,7 @@ static void icl_dpll_write(struct drm_i915_private *dev_priv,
|
||||||
cfgcr0_reg = TGL_DPLL_CFGCR0(id);
|
cfgcr0_reg = TGL_DPLL_CFGCR0(id);
|
||||||
cfgcr1_reg = TGL_DPLL_CFGCR1(id);
|
cfgcr1_reg = TGL_DPLL_CFGCR1(id);
|
||||||
} else {
|
} else {
|
||||||
if (IS_ELKHARTLAKE(dev_priv) && id == DPLL_ID_EHL_DPLL4) {
|
if (IS_JSL_EHL(dev_priv) && id == DPLL_ID_EHL_DPLL4) {
|
||||||
cfgcr0_reg = ICL_DPLL_CFGCR0(4);
|
cfgcr0_reg = ICL_DPLL_CFGCR0(4);
|
||||||
cfgcr1_reg = ICL_DPLL_CFGCR1(4);
|
cfgcr1_reg = ICL_DPLL_CFGCR1(4);
|
||||||
} else {
|
} else {
|
||||||
|
@ -4076,7 +4076,7 @@ static void combo_pll_enable(struct drm_i915_private *dev_priv,
|
||||||
{
|
{
|
||||||
i915_reg_t enable_reg = intel_combo_pll_enable_reg(dev_priv, pll);
|
i915_reg_t enable_reg = intel_combo_pll_enable_reg(dev_priv, pll);
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(dev_priv) &&
|
if (IS_JSL_EHL(dev_priv) &&
|
||||||
pll->info->id == DPLL_ID_EHL_DPLL4) {
|
pll->info->id == DPLL_ID_EHL_DPLL4) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -4189,7 +4189,7 @@ static void combo_pll_disable(struct drm_i915_private *dev_priv,
|
||||||
|
|
||||||
icl_pll_disable(dev_priv, pll, enable_reg);
|
icl_pll_disable(dev_priv, pll, enable_reg);
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(dev_priv) &&
|
if (IS_JSL_EHL(dev_priv) &&
|
||||||
pll->info->id == DPLL_ID_EHL_DPLL4)
|
pll->info->id == DPLL_ID_EHL_DPLL4)
|
||||||
intel_display_power_put(dev_priv, POWER_DOMAIN_DPLL_DC_OFF,
|
intel_display_power_put(dev_priv, POWER_DOMAIN_DPLL_DC_OFF,
|
||||||
pll->wakeref);
|
pll->wakeref);
|
||||||
|
@ -4356,7 +4356,7 @@ void intel_shared_dpll_init(struct drm_device *dev)
|
||||||
dpll_mgr = &rkl_pll_mgr;
|
dpll_mgr = &rkl_pll_mgr;
|
||||||
else if (INTEL_GEN(dev_priv) >= 12)
|
else if (INTEL_GEN(dev_priv) >= 12)
|
||||||
dpll_mgr = &tgl_pll_mgr;
|
dpll_mgr = &tgl_pll_mgr;
|
||||||
else if (IS_ELKHARTLAKE(dev_priv))
|
else if (IS_JSL_EHL(dev_priv))
|
||||||
dpll_mgr = &ehl_pll_mgr;
|
dpll_mgr = &ehl_pll_mgr;
|
||||||
else if (INTEL_GEN(dev_priv) >= 11)
|
else if (INTEL_GEN(dev_priv) >= 11)
|
||||||
dpll_mgr = &icl_pll_mgr;
|
dpll_mgr = &icl_pll_mgr;
|
||||||
|
@ -4498,7 +4498,7 @@ static void readout_dpll_hw_state(struct drm_i915_private *i915,
|
||||||
pll->on = pll->info->funcs->get_hw_state(i915, pll,
|
pll->on = pll->info->funcs->get_hw_state(i915, pll,
|
||||||
&pll->state.hw_state);
|
&pll->state.hw_state);
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(i915) && pll->on &&
|
if (IS_JSL_EHL(i915) && pll->on &&
|
||||||
pll->info->id == DPLL_ID_EHL_DPLL4) {
|
pll->info->id == DPLL_ID_EHL_DPLL4) {
|
||||||
pll->wakeref = intel_display_power_get(i915,
|
pll->wakeref = intel_display_power_get(i915,
|
||||||
POWER_DOMAIN_DPLL_DC_OFF);
|
POWER_DOMAIN_DPLL_DC_OFF);
|
||||||
|
|
|
@ -169,7 +169,7 @@ static void gen11_sseu_info_init(struct intel_gt *gt)
|
||||||
u8 eu_en;
|
u8 eu_en;
|
||||||
u8 s_en;
|
u8 s_en;
|
||||||
|
|
||||||
if (IS_ELKHARTLAKE(gt->i915))
|
if (IS_JSL_EHL(gt->i915))
|
||||||
intel_sseu_set_info(sseu, 1, 4, 8);
|
intel_sseu_set_info(sseu, 1, 4, 8);
|
||||||
else
|
else
|
||||||
intel_sseu_set_info(sseu, 1, 8, 8);
|
intel_sseu_set_info(sseu, 1, 8, 8);
|
||||||
|
|
|
@ -1212,7 +1212,7 @@ icl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
|
||||||
|
|
||||||
/* Wa_1607087056:icl,ehl,jsl */
|
/* Wa_1607087056:icl,ehl,jsl */
|
||||||
if (IS_ICELAKE(i915) ||
|
if (IS_ICELAKE(i915) ||
|
||||||
IS_EHL_REVID(i915, EHL_REVID_A0, EHL_REVID_A0)) {
|
IS_JSL_EHL_REVID(i915, EHL_REVID_A0, EHL_REVID_A0)) {
|
||||||
wa_write_or(wal,
|
wa_write_or(wal,
|
||||||
SLICE_UNIT_LEVEL_CLKGATE,
|
SLICE_UNIT_LEVEL_CLKGATE,
|
||||||
L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS);
|
L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS);
|
||||||
|
@ -1839,7 +1839,7 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
|
||||||
GEN12_FF_TESSELATION_DOP_GATE_DISABLE);
|
GEN12_FF_TESSELATION_DOP_GATE_DISABLE);
|
||||||
|
|
||||||
/* Wa_22010271021:ehl */
|
/* Wa_22010271021:ehl */
|
||||||
if (IS_ELKHARTLAKE(i915))
|
if (IS_JSL_EHL(i915))
|
||||||
wa_masked_en(wal,
|
wa_masked_en(wal,
|
||||||
GEN9_CS_DEBUG_MODE1,
|
GEN9_CS_DEBUG_MODE1,
|
||||||
FF_DOP_CLOCK_GATE_DISABLE);
|
FF_DOP_CLOCK_GATE_DISABLE);
|
||||||
|
|
|
@ -53,6 +53,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
|
||||||
#define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
|
#define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
|
||||||
fw_def(ROCKETLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \
|
fw_def(ROCKETLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \
|
||||||
fw_def(TIGERLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \
|
fw_def(TIGERLAKE, 0, guc_def(tgl, 35, 2, 0), huc_def(tgl, 7, 5, 0)) \
|
||||||
|
fw_def(JASPERLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \
|
||||||
fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \
|
fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \
|
||||||
fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
|
fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
|
||||||
fw_def(COMETLAKE, 5, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \
|
fw_def(COMETLAKE, 5, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \
|
||||||
|
|
|
@ -1417,7 +1417,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
|
||||||
#define IS_COMETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COMETLAKE)
|
#define IS_COMETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COMETLAKE)
|
||||||
#define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE)
|
#define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE)
|
||||||
#define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)
|
#define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)
|
||||||
#define IS_ELKHARTLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)
|
#define IS_JSL_EHL(dev_priv) (IS_PLATFORM(dev_priv, INTEL_JASPERLAKE) || \
|
||||||
|
IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE))
|
||||||
#define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE)
|
#define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE)
|
||||||
#define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE)
|
#define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE)
|
||||||
#define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
|
#define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)
|
||||||
|
@ -1558,8 +1559,8 @@ extern const struct i915_rev_steppings kbl_revids[];
|
||||||
|
|
||||||
#define EHL_REVID_A0 0x0
|
#define EHL_REVID_A0 0x0
|
||||||
|
|
||||||
#define IS_EHL_REVID(p, since, until) \
|
#define IS_JSL_EHL_REVID(p, since, until) \
|
||||||
(IS_ELKHARTLAKE(p) && IS_REVID(p, since, until))
|
(IS_JSL_EHL(p) && IS_REVID(p, since, until))
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
TGL_REVID_A0,
|
TGL_REVID_A0,
|
||||||
|
|
|
@ -846,6 +846,14 @@ static const struct intel_device_info ehl_info = {
|
||||||
.ppgtt_size = 36,
|
.ppgtt_size = 36,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct intel_device_info jsl_info = {
|
||||||
|
GEN11_FEATURES,
|
||||||
|
PLATFORM(INTEL_JASPERLAKE),
|
||||||
|
.require_force_probe = 1,
|
||||||
|
.platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0) | BIT(VECS0),
|
||||||
|
.ppgtt_size = 36,
|
||||||
|
};
|
||||||
|
|
||||||
#define GEN12_FEATURES \
|
#define GEN12_FEATURES \
|
||||||
GEN11_FEATURES, \
|
GEN11_FEATURES, \
|
||||||
GEN(12), \
|
GEN(12), \
|
||||||
|
@ -985,6 +993,7 @@ static const struct pci_device_id pciidlist[] = {
|
||||||
INTEL_CNL_IDS(&cnl_info),
|
INTEL_CNL_IDS(&cnl_info),
|
||||||
INTEL_ICL_11_IDS(&icl_info),
|
INTEL_ICL_11_IDS(&icl_info),
|
||||||
INTEL_EHL_IDS(&ehl_info),
|
INTEL_EHL_IDS(&ehl_info),
|
||||||
|
INTEL_JSL_IDS(&jsl_info),
|
||||||
INTEL_TGL_12_IDS(&tgl_info),
|
INTEL_TGL_12_IDS(&tgl_info),
|
||||||
INTEL_RKL_IDS(&rkl_info),
|
INTEL_RKL_IDS(&rkl_info),
|
||||||
{0, 0, 0}
|
{0, 0, 0}
|
||||||
|
|
|
@ -62,6 +62,7 @@ static const char * const platform_names[] = {
|
||||||
PLATFORM_NAME(CANNONLAKE),
|
PLATFORM_NAME(CANNONLAKE),
|
||||||
PLATFORM_NAME(ICELAKE),
|
PLATFORM_NAME(ICELAKE),
|
||||||
PLATFORM_NAME(ELKHARTLAKE),
|
PLATFORM_NAME(ELKHARTLAKE),
|
||||||
|
PLATFORM_NAME(JASPERLAKE),
|
||||||
PLATFORM_NAME(TIGERLAKE),
|
PLATFORM_NAME(TIGERLAKE),
|
||||||
PLATFORM_NAME(ROCKETLAKE),
|
PLATFORM_NAME(ROCKETLAKE),
|
||||||
PLATFORM_NAME(DG1),
|
PLATFORM_NAME(DG1),
|
||||||
|
|
|
@ -79,6 +79,7 @@ enum intel_platform {
|
||||||
/* gen11 */
|
/* gen11 */
|
||||||
INTEL_ICELAKE,
|
INTEL_ICELAKE,
|
||||||
INTEL_ELKHARTLAKE,
|
INTEL_ELKHARTLAKE,
|
||||||
|
INTEL_JASPERLAKE,
|
||||||
/* gen12 */
|
/* gen12 */
|
||||||
INTEL_TIGERLAKE,
|
INTEL_TIGERLAKE,
|
||||||
INTEL_ROCKETLAKE,
|
INTEL_ROCKETLAKE,
|
||||||
|
|
|
@ -115,7 +115,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
|
||||||
return PCH_ICP;
|
return PCH_ICP;
|
||||||
case INTEL_PCH_MCC_DEVICE_ID_TYPE:
|
case INTEL_PCH_MCC_DEVICE_ID_TYPE:
|
||||||
drm_dbg_kms(&dev_priv->drm, "Found Mule Creek Canyon PCH\n");
|
drm_dbg_kms(&dev_priv->drm, "Found Mule Creek Canyon PCH\n");
|
||||||
drm_WARN_ON(&dev_priv->drm, !IS_ELKHARTLAKE(dev_priv));
|
drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));
|
||||||
return PCH_MCC;
|
return PCH_MCC;
|
||||||
case INTEL_PCH_TGP_DEVICE_ID_TYPE:
|
case INTEL_PCH_TGP_DEVICE_ID_TYPE:
|
||||||
case INTEL_PCH_TGP2_DEVICE_ID_TYPE:
|
case INTEL_PCH_TGP2_DEVICE_ID_TYPE:
|
||||||
|
@ -126,7 +126,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
|
||||||
case INTEL_PCH_JSP_DEVICE_ID_TYPE:
|
case INTEL_PCH_JSP_DEVICE_ID_TYPE:
|
||||||
case INTEL_PCH_JSP2_DEVICE_ID_TYPE:
|
case INTEL_PCH_JSP2_DEVICE_ID_TYPE:
|
||||||
drm_dbg_kms(&dev_priv->drm, "Found Jasper Lake PCH\n");
|
drm_dbg_kms(&dev_priv->drm, "Found Jasper Lake PCH\n");
|
||||||
drm_WARN_ON(&dev_priv->drm, !IS_ELKHARTLAKE(dev_priv));
|
drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));
|
||||||
return PCH_JSP;
|
return PCH_JSP;
|
||||||
default:
|
default:
|
||||||
return PCH_NONE;
|
return PCH_NONE;
|
||||||
|
@ -157,7 +157,7 @@ intel_virt_detect_pch(const struct drm_i915_private *dev_priv)
|
||||||
|
|
||||||
if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv))
|
if (IS_TIGERLAKE(dev_priv) || IS_ROCKETLAKE(dev_priv))
|
||||||
id = INTEL_PCH_TGP_DEVICE_ID_TYPE;
|
id = INTEL_PCH_TGP_DEVICE_ID_TYPE;
|
||||||
else if (IS_ELKHARTLAKE(dev_priv))
|
else if (IS_JSL_EHL(dev_priv))
|
||||||
id = INTEL_PCH_MCC_DEVICE_ID_TYPE;
|
id = INTEL_PCH_MCC_DEVICE_ID_TYPE;
|
||||||
else if (IS_ICELAKE(dev_priv))
|
else if (IS_ICELAKE(dev_priv))
|
||||||
id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
|
id = INTEL_PCH_ICP_DEVICE_ID_TYPE;
|
||||||
|
|
|
@ -579,15 +579,18 @@
|
||||||
INTEL_VGA_DEVICE(0x8A51, info), \
|
INTEL_VGA_DEVICE(0x8A51, info), \
|
||||||
INTEL_VGA_DEVICE(0x8A5D, info)
|
INTEL_VGA_DEVICE(0x8A5D, info)
|
||||||
|
|
||||||
/* EHL/JSL */
|
/* EHL */
|
||||||
#define INTEL_EHL_IDS(info) \
|
#define INTEL_EHL_IDS(info) \
|
||||||
INTEL_VGA_DEVICE(0x4500, info), \
|
INTEL_VGA_DEVICE(0x4500, info), \
|
||||||
INTEL_VGA_DEVICE(0x4571, info), \
|
INTEL_VGA_DEVICE(0x4571, info), \
|
||||||
INTEL_VGA_DEVICE(0x4551, info), \
|
INTEL_VGA_DEVICE(0x4551, info), \
|
||||||
INTEL_VGA_DEVICE(0x4541, info), \
|
INTEL_VGA_DEVICE(0x4541, info), \
|
||||||
INTEL_VGA_DEVICE(0x4E71, info), \
|
|
||||||
INTEL_VGA_DEVICE(0x4557, info), \
|
INTEL_VGA_DEVICE(0x4557, info), \
|
||||||
INTEL_VGA_DEVICE(0x4555, info), \
|
INTEL_VGA_DEVICE(0x4555, info)
|
||||||
|
|
||||||
|
/* JSL */
|
||||||
|
#define INTEL_JSL_IDS(info) \
|
||||||
|
INTEL_VGA_DEVICE(0x4E71, info), \
|
||||||
INTEL_VGA_DEVICE(0x4E61, info), \
|
INTEL_VGA_DEVICE(0x4E61, info), \
|
||||||
INTEL_VGA_DEVICE(0x4E57, info), \
|
INTEL_VGA_DEVICE(0x4E57, info), \
|
||||||
INTEL_VGA_DEVICE(0x4E55, info), \
|
INTEL_VGA_DEVICE(0x4E55, info), \
|
||||||
|
|
Loading…
Reference in a new issue