mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
drm/i915/tc: Update DP_MODE programming
BSpec was updated(r146548) with a new MG_DP_MODE Programming table, now taking in consideration the pin assignment and allowing us to optimize power by shutting down available but not needed lanes. It was tested on ICL and TGL, with adaptors that used pin assignment C and B, reversing the connector and going to different modes testing the not needed lane shutdown. v5: Using crtc_state->lane_count instead of dp.lane_count BSpec: 21735 BSpec: 49292 Cc: Imre Deak <imre.deak@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Clinton A Taylor <clinton.a.taylor@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190926210659.56317-1-jose.souza@intel.com
This commit is contained in:
parent
283a4095af
commit
3b51be4e40
4 changed files with 73 additions and 42 deletions
|
@ -3091,11 +3091,14 @@ icl_phy_set_clock_gating(struct intel_digital_port *dig_port, bool enable)
|
|||
I915_WRITE(MG_MISC_SUS0(tc_port), val);
|
||||
}
|
||||
|
||||
static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)
|
||||
static void
|
||||
icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,
|
||||
const struct intel_crtc_state *crtc_state)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev);
|
||||
enum port port = intel_dig_port->base.port;
|
||||
u32 ln0, ln1, lane_mask;
|
||||
u32 ln0, ln1, pin_assignment;
|
||||
u8 width;
|
||||
|
||||
if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
|
||||
return;
|
||||
|
@ -3103,50 +3106,57 @@ static void icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port)
|
|||
ln0 = I915_READ(MG_DP_MODE(0, port));
|
||||
ln1 = I915_READ(MG_DP_MODE(1, port));
|
||||
|
||||
switch (intel_dig_port->tc_mode) {
|
||||
case TC_PORT_DP_ALT:
|
||||
ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
|
||||
ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
|
||||
ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X1_MODE);
|
||||
ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
|
||||
|
||||
lane_mask = intel_tc_port_get_lane_mask(intel_dig_port);
|
||||
/* DPPATC */
|
||||
pin_assignment = intel_tc_port_get_pin_assignment_mask(intel_dig_port);
|
||||
width = crtc_state->lane_count;
|
||||
|
||||
switch (lane_mask) {
|
||||
case 0x1:
|
||||
case 0x4:
|
||||
break;
|
||||
case 0x2:
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
||||
break;
|
||||
case 0x3:
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE |
|
||||
MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
break;
|
||||
case 0x8:
|
||||
switch (pin_assignment) {
|
||||
case 0x0:
|
||||
WARN_ON(intel_dig_port->tc_mode != TC_PORT_LEGACY);
|
||||
if (width == 1) {
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
||||
break;
|
||||
case 0xC:
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE |
|
||||
MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
break;
|
||||
case 0xF:
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE |
|
||||
MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE |
|
||||
MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
break;
|
||||
default:
|
||||
MISSING_CASE(lane_mask);
|
||||
} else {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
}
|
||||
break;
|
||||
|
||||
case TC_PORT_LEGACY:
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
case 0x1:
|
||||
if (width == 4) {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
}
|
||||
break;
|
||||
case 0x2:
|
||||
if (width == 2) {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
}
|
||||
break;
|
||||
case 0x3:
|
||||
case 0x5:
|
||||
if (width == 1) {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
||||
} else {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
}
|
||||
break;
|
||||
case 0x4:
|
||||
case 0x6:
|
||||
if (width == 1) {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
||||
} else {
|
||||
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
MISSING_CASE(intel_dig_port->tc_mode);
|
||||
return;
|
||||
MISSING_CASE(pin_assignment);
|
||||
}
|
||||
|
||||
I915_WRITE(MG_DP_MODE(0, port), ln0);
|
||||
|
@ -3239,7 +3249,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
|
|||
dig_port->ddi_io_power_domain);
|
||||
|
||||
/* 6. */
|
||||
icl_program_mg_dp_mode(dig_port);
|
||||
icl_program_mg_dp_mode(dig_port, crtc_state);
|
||||
|
||||
/*
|
||||
* 7.a - Steps in this function should only be executed over MST
|
||||
|
@ -3321,7 +3331,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder *encoder,
|
|||
intel_display_power_get(dev_priv,
|
||||
dig_port->ddi_io_power_domain);
|
||||
|
||||
icl_program_mg_dp_mode(dig_port);
|
||||
icl_program_mg_dp_mode(dig_port, crtc_state);
|
||||
icl_phy_set_clock_gating(dig_port, false);
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11)
|
||||
|
@ -3391,7 +3401,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
|
|||
|
||||
intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
|
||||
|
||||
icl_program_mg_dp_mode(dig_port);
|
||||
icl_program_mg_dp_mode(dig_port, crtc_state);
|
||||
icl_phy_set_clock_gating(dig_port, false);
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11)
|
||||
|
|
|
@ -67,6 +67,21 @@ u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port)
|
|||
return lane_mask >> DP_LANE_ASSIGNMENT_SHIFT(dig_port->tc_phy_fia_idx);
|
||||
}
|
||||
|
||||
u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port)
|
||||
{
|
||||
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
||||
struct intel_uncore *uncore = &i915->uncore;
|
||||
u32 pin_mask;
|
||||
|
||||
pin_mask = intel_uncore_read(uncore,
|
||||
PORT_TX_DFLEXPA1(dig_port->tc_phy_fia));
|
||||
|
||||
WARN_ON(pin_mask == 0xffffffff);
|
||||
|
||||
return (pin_mask & DP_PIN_ASSIGNMENT_MASK(dig_port->tc_phy_fia_idx)) >>
|
||||
DP_PIN_ASSIGNMENT_SHIFT(dig_port->tc_phy_fia_idx);
|
||||
}
|
||||
|
||||
int intel_tc_port_fia_max_lane_count(struct intel_digital_port *dig_port)
|
||||
{
|
||||
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
||||
|
|
|
@ -13,6 +13,7 @@ struct intel_digital_port;
|
|||
|
||||
bool intel_tc_port_connected(struct intel_digital_port *dig_port);
|
||||
u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port);
|
||||
u32 intel_tc_port_get_pin_assignment_mask(struct intel_digital_port *dig_port);
|
||||
int intel_tc_port_fia_max_lane_count(struct intel_digital_port *dig_port);
|
||||
void intel_tc_port_set_fia_lane_count(struct intel_digital_port *dig_port,
|
||||
int required_lanes);
|
||||
|
|
|
@ -11861,6 +11861,11 @@ enum skl_power_gate {
|
|||
#define PORT_TX_DFLEXDPCSSS(fia) _MMIO_FIA((fia), 0x00894)
|
||||
#define DP_PHY_MODE_STATUS_NOT_SAFE(idx) (1 << (idx))
|
||||
|
||||
#define PORT_TX_DFLEXPA1(fia) _MMIO_FIA((fia), 0x00880)
|
||||
#define DP_PIN_ASSIGNMENT_SHIFT(idx) ((idx) * 4)
|
||||
#define DP_PIN_ASSIGNMENT_MASK(idx) (0xf << ((idx) * 4))
|
||||
#define DP_PIN_ASSIGNMENT(idx, x) ((x) << ((idx) * 4))
|
||||
|
||||
/* This register controls the Display State Buffer (DSB) engines. */
|
||||
#define _DSBSL_INSTANCE_BASE 0x70B00
|
||||
#define DSBSL_INSTANCE(pipe, id) (_DSBSL_INSTANCE_BASE + \
|
||||
|
|
Loading…
Reference in a new issue