drm/i915: Transition port type checks to phy checks
Transition the remaining uses of intel_port_is_* over to the equivalent intel_phy_is_* functions and drop the port functions. v5: Fix a call in a debug function that's only called when CONFIG_DRM_I915_DEBUG_RUNTIME_PM is on. (CI) Cc: José Roberto de Souza <jose.souza@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190709183934.445-5-matthew.d.roper@intel.com
This commit is contained in:
parent
dc867bc7d8
commit
d8fe2ab6bb
|
@ -28,6 +28,7 @@
|
|||
#include <drm/drm_dp_helper.h>
|
||||
#include <drm/i915_drm.h>
|
||||
|
||||
#include "display/intel_display.h"
|
||||
#include "display/intel_gmbus.h"
|
||||
|
||||
#include "i915_drv.h"
|
||||
|
@ -1733,12 +1734,13 @@ init_vbt_missing_defaults(struct drm_i915_private *dev_priv)
|
|||
for (port = PORT_A; port < I915_MAX_PORTS; port++) {
|
||||
struct ddi_vbt_port_info *info =
|
||||
&dev_priv->vbt.ddi_port_info[port];
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
|
||||
/*
|
||||
* VBT has the TypeC mode (native,TBT/USB) and we don't want
|
||||
* to detect it.
|
||||
*/
|
||||
if (intel_port_is_tc(dev_priv, port))
|
||||
if (intel_phy_is_tc(dev_priv, phy))
|
||||
continue;
|
||||
|
||||
info->supports_dvi = (port != PORT_A && port != PORT_E);
|
||||
|
|
|
@ -868,11 +868,12 @@ icl_get_combo_buf_trans(struct drm_i915_private *dev_priv, int type, int rate,
|
|||
static int intel_ddi_hdmi_level(struct drm_i915_private *dev_priv, enum port port)
|
||||
{
|
||||
int n_entries, level, default_entry;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
|
||||
level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11) {
|
||||
if (intel_port_is_combophy(dev_priv, port))
|
||||
if (intel_phy_is_combo(dev_priv, phy))
|
||||
icl_get_combo_buf_trans(dev_priv, INTEL_OUTPUT_HDMI,
|
||||
0, &n_entries);
|
||||
else
|
||||
|
@ -1487,9 +1488,10 @@ static void icl_ddi_clock_get(struct intel_encoder *encoder,
|
|||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_dpll_hw_state *pll_state = &pipe_config->dpll_hw_state;
|
||||
enum port port = encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
int link_clock;
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, port)) {
|
||||
if (intel_phy_is_combo(dev_priv, phy)) {
|
||||
link_clock = cnl_calc_wrpll_link(dev_priv, pll_state);
|
||||
} else {
|
||||
enum intel_dpll_id pll_id = intel_get_shared_dpll_id(dev_priv,
|
||||
|
@ -2086,6 +2088,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
|
|||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_digital_port *dig_port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
/*
|
||||
* TODO: Add support for MST encoders. Atm, the following should never
|
||||
|
@ -2103,7 +2106,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
|
|||
* ports.
|
||||
*/
|
||||
if (intel_crtc_has_dp_encoder(crtc_state) ||
|
||||
intel_port_is_tc(dev_priv, encoder->port))
|
||||
intel_phy_is_tc(dev_priv, phy))
|
||||
intel_display_power_get(dev_priv,
|
||||
intel_ddi_main_link_aux_domain(dig_port));
|
||||
|
||||
|
@ -2228,10 +2231,11 @@ u8 intel_ddi_dp_voltage_max(struct intel_encoder *encoder)
|
|||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
|
||||
enum port port = encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
int n_entries;
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11) {
|
||||
if (intel_port_is_combophy(dev_priv, port))
|
||||
if (intel_phy_is_combo(dev_priv, phy))
|
||||
icl_get_combo_buf_trans(dev_priv, encoder->type,
|
||||
intel_dp->link_rate, &n_entries);
|
||||
else
|
||||
|
@ -2664,9 +2668,9 @@ static void icl_ddi_vswing_sequence(struct intel_encoder *encoder,
|
|||
enum intel_output_type type)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
enum port port = encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, port))
|
||||
if (intel_phy_is_combo(dev_priv, phy))
|
||||
icl_combo_phy_ddi_vswing_sequence(encoder, level, type);
|
||||
else
|
||||
icl_mg_phy_ddi_vswing_sequence(encoder, link_clock, level);
|
||||
|
@ -2877,6 +2881,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
|
|||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
enum port port = encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
u32 val;
|
||||
const struct intel_shared_dpll *pll = crtc_state->shared_dpll;
|
||||
|
||||
|
@ -2886,7 +2891,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
|
|||
mutex_lock(&dev_priv->dpll_lock);
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11) {
|
||||
if (!intel_port_is_combophy(dev_priv, port))
|
||||
if (!intel_phy_is_combo(dev_priv, phy))
|
||||
I915_WRITE(DDI_CLK_SEL(port),
|
||||
icl_pll_to_ddi_clk_sel(encoder, crtc_state));
|
||||
} else if (IS_CANNONLAKE(dev_priv)) {
|
||||
|
@ -2926,9 +2931,10 @@ static void intel_ddi_clk_disable(struct intel_encoder *encoder)
|
|||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
enum port port = encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11) {
|
||||
if (!intel_port_is_combophy(dev_priv, port))
|
||||
if (!intel_phy_is_combo(dev_priv, phy))
|
||||
I915_WRITE(DDI_CLK_SEL(port), DDI_CLK_SEL_NONE);
|
||||
} else if (IS_CANNONLAKE(dev_priv)) {
|
||||
I915_WRITE(DPCLKA_CFGCR0, I915_READ(DPCLKA_CFGCR0) |
|
||||
|
@ -3135,7 +3141,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
|
|||
|
||||
intel_ddi_clk_select(encoder, crtc_state);
|
||||
|
||||
if (!intel_port_is_tc(dev_priv, port) ||
|
||||
if (!intel_phy_is_tc(dev_priv, phy) ||
|
||||
dig_port->tc_mode != TC_PORT_TBT_ALT)
|
||||
intel_display_power_get(dev_priv,
|
||||
dig_port->ddi_io_power_domain);
|
||||
|
@ -3153,7 +3159,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
|
|||
else
|
||||
intel_prepare_dp_ddi_buffers(encoder, crtc_state);
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, port)) {
|
||||
if (intel_phy_is_combo(dev_priv, phy)) {
|
||||
bool lane_reversal =
|
||||
dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;
|
||||
|
||||
|
@ -3305,6 +3311,7 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
|
|||
struct intel_dp *intel_dp = &dig_port->dp;
|
||||
bool is_mst = intel_crtc_has_type(old_crtc_state,
|
||||
INTEL_OUTPUT_DP_MST);
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
if (!is_mst) {
|
||||
intel_ddi_disable_pipe_clock(old_crtc_state);
|
||||
|
@ -3320,7 +3327,7 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,
|
|||
intel_edp_panel_vdd_on(intel_dp);
|
||||
intel_edp_panel_off(intel_dp);
|
||||
|
||||
if (!intel_port_is_tc(dev_priv, encoder->port) ||
|
||||
if (!intel_phy_is_tc(dev_priv, phy) ||
|
||||
dig_port->tc_mode != TC_PORT_TBT_ALT)
|
||||
intel_display_power_put_unchecked(dev_priv,
|
||||
dig_port->ddi_io_power_domain);
|
||||
|
@ -3639,7 +3646,8 @@ intel_ddi_pre_pll_enable(struct intel_encoder *encoder,
|
|||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
|
||||
bool is_tc_port = intel_port_is_tc(dev_priv, encoder->port);
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
bool is_tc_port = intel_phy_is_tc(dev_priv, phy);
|
||||
|
||||
if (is_tc_port)
|
||||
intel_tc_port_get_link(dig_port, crtc_state->lane_count);
|
||||
|
@ -3666,7 +3674,8 @@ intel_ddi_post_pll_disable(struct intel_encoder *encoder,
|
|||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
|
||||
bool is_tc_port = intel_port_is_tc(dev_priv, encoder->port);
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
bool is_tc_port = intel_phy_is_tc(dev_priv, phy);
|
||||
|
||||
if (intel_crtc_has_dp_encoder(crtc_state) || is_tc_port)
|
||||
intel_display_power_put_unchecked(dev_priv,
|
||||
|
@ -4178,6 +4187,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
|
|||
struct drm_encoder *encoder;
|
||||
bool init_hdmi, init_dp, init_lspcon = false;
|
||||
enum pipe pipe;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
|
||||
init_hdmi = port_info->supports_dvi || port_info->supports_hdmi;
|
||||
init_dp = port_info->supports_dp;
|
||||
|
@ -4241,7 +4251,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
|
|||
intel_dig_port->max_lanes = intel_ddi_max_lanes(intel_dig_port);
|
||||
intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
|
||||
|
||||
if (intel_port_is_tc(dev_priv, port)) {
|
||||
if (intel_phy_is_tc(dev_priv, phy)) {
|
||||
bool is_legacy = !port_info->supports_typec_usb &&
|
||||
!port_info->supports_tbt;
|
||||
|
||||
|
|
|
@ -6671,20 +6671,6 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)
|
|||
I915_WRITE(BCLRPAT(crtc->pipe), 0);
|
||||
}
|
||||
|
||||
bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
|
||||
{
|
||||
if (port == PORT_NONE)
|
||||
return false;
|
||||
|
||||
if (IS_ELKHARTLAKE(dev_priv))
|
||||
return port <= PORT_C;
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11)
|
||||
return port <= PORT_B;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)
|
||||
{
|
||||
if (phy == PHY_NONE)
|
||||
|
@ -6699,14 +6685,6 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port)
|
||||
{
|
||||
if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
|
||||
return port >= PORT_C && port <= PORT_F;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)
|
||||
{
|
||||
if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
|
||||
|
@ -6756,8 +6734,9 @@ enum intel_display_power_domain
|
|||
intel_aux_power_domain(struct intel_digital_port *dig_port)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
||||
enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
|
||||
|
||||
if (intel_port_is_tc(dev_priv, dig_port->base.port) &&
|
||||
if (intel_phy_is_tc(dev_priv, phy) &&
|
||||
dig_port->tc_mode == TC_PORT_TBT_ALT) {
|
||||
switch (dig_port->aux_ch) {
|
||||
case AUX_CH_C:
|
||||
|
@ -10091,16 +10070,17 @@ static void icelake_get_ddi_pll(struct drm_i915_private *dev_priv,
|
|||
enum port port,
|
||||
struct intel_crtc_state *pipe_config)
|
||||
{
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
enum icl_port_dpll_id port_dpll_id;
|
||||
enum intel_dpll_id id;
|
||||
u32 temp;
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, port)) {
|
||||
if (intel_phy_is_combo(dev_priv, phy)) {
|
||||
temp = I915_READ(ICL_DPCLKA_CFGCR0) &
|
||||
DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);
|
||||
id = temp >> DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port);
|
||||
ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy);
|
||||
id = temp >> ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(phy);
|
||||
port_dpll_id = ICL_PORT_DPLL_DEFAULT;
|
||||
} else if (intel_port_is_tc(dev_priv, port)) {
|
||||
} else if (intel_phy_is_tc(dev_priv, phy)) {
|
||||
u32 clk_sel = I915_READ(DDI_CLK_SEL(port)) & DDI_CLK_SEL_MASK;
|
||||
|
||||
if (clk_sel == DDI_CLK_SEL_MG) {
|
||||
|
@ -16962,9 +16942,11 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
|
|||
|
||||
/* Sanitize the TypeC port mode upfront, encoders depend on this */
|
||||
for_each_intel_encoder(dev, encoder) {
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
/* We need to sanitize only the MST primary port. */
|
||||
if (encoder->type != INTEL_OUTPUT_DP_MST &&
|
||||
intel_port_is_tc(dev_priv, encoder->port))
|
||||
intel_phy_is_tc(dev_priv, phy))
|
||||
intel_tc_port_sanitize(enc_to_dig_port(&encoder->base));
|
||||
}
|
||||
|
||||
|
|
|
@ -489,7 +489,9 @@ static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_priv,
|
|||
aux_ch = icl_tc_phy_aux_ch(dev_priv, power_well);
|
||||
|
||||
for_each_intel_encoder(&dev_priv->drm, encoder) {
|
||||
if (!intel_port_is_tc(dev_priv, encoder->port))
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
if (!intel_phy_is_tc(dev_priv, phy))
|
||||
continue;
|
||||
|
||||
/* We'll check the MST primary port */
|
||||
|
|
|
@ -297,9 +297,9 @@ static int icl_max_source_rate(struct intel_dp *intel_dp)
|
|||
{
|
||||
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
||||
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
||||
enum port port = dig_port->base.port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, port) &&
|
||||
if (intel_phy_is_combo(dev_priv, phy) &&
|
||||
!IS_ELKHARTLAKE(dev_priv) &&
|
||||
!intel_dp_is_edp(intel_dp))
|
||||
return 540000;
|
||||
|
@ -1192,7 +1192,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,
|
|||
struct drm_i915_private *i915 =
|
||||
to_i915(intel_dig_port->base.base.dev);
|
||||
struct intel_uncore *uncore = &i915->uncore;
|
||||
bool is_tc_port = intel_port_is_tc(i915, intel_dig_port->base.port);
|
||||
enum phy phy = intel_port_to_phy(i915, intel_dig_port->base.port);
|
||||
bool is_tc_port = intel_phy_is_tc(i915, phy);
|
||||
i915_reg_t ch_ctl, ch_data[5];
|
||||
u32 aux_clock_divider;
|
||||
enum intel_display_power_domain aux_domain =
|
||||
|
@ -5211,10 +5212,11 @@ static bool icl_digital_port_connected(struct intel_encoder *encoder)
|
|||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
||||
struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, encoder->port))
|
||||
if (intel_phy_is_combo(dev_priv, phy))
|
||||
return icl_combo_port_connected(dev_priv, dig_port);
|
||||
else if (intel_port_is_tc(dev_priv, encoder->port))
|
||||
else if (intel_phy_is_tc(dev_priv, phy))
|
||||
return intel_tc_port_connected(dig_port);
|
||||
else
|
||||
MISSING_CASE(encoder->hpd_pin);
|
||||
|
@ -7113,6 +7115,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
|
|||
struct drm_device *dev = intel_encoder->base.dev;
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
enum port port = intel_encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, port);
|
||||
int type;
|
||||
|
||||
/* Initialize the work for modeset in case of link train failure */
|
||||
|
@ -7139,7 +7142,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
|
|||
* Currently we don't support eDP on TypeC ports, although in
|
||||
* theory it could work on TypeC legacy ports.
|
||||
*/
|
||||
WARN_ON(intel_port_is_tc(dev_priv, port));
|
||||
WARN_ON(intel_phy_is_tc(dev_priv, phy));
|
||||
type = DRM_MODE_CONNECTOR_eDP;
|
||||
} else {
|
||||
type = DRM_MODE_CONNECTOR_DisplayPort;
|
||||
|
|
|
@ -2584,7 +2584,8 @@ static bool icl_calc_dpll_state(struct intel_crtc_state *crtc_state,
|
|||
struct skl_wrpll_params pll_params = { 0 };
|
||||
bool ret;
|
||||
|
||||
if (intel_port_is_tc(dev_priv, encoder->port))
|
||||
if (intel_phy_is_tc(dev_priv, intel_port_to_phy(dev_priv,
|
||||
encoder->port)))
|
||||
ret = icl_calc_tbt_pll(crtc_state, &pll_params);
|
||||
else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) ||
|
||||
intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI))
|
||||
|
@ -3004,14 +3005,14 @@ static bool icl_get_dplls(struct intel_atomic_state *state,
|
|||
struct intel_encoder *encoder)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
|
||||
enum port port = encoder->port;
|
||||
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
||||
|
||||
if (intel_port_is_combophy(dev_priv, port))
|
||||
if (intel_phy_is_combo(dev_priv, phy))
|
||||
return icl_get_combo_phy_dpll(state, crtc, encoder);
|
||||
else if (intel_port_is_tc(dev_priv, port))
|
||||
else if (intel_phy_is_tc(dev_priv, phy))
|
||||
return icl_get_tc_phy_dplls(state, crtc, encoder);
|
||||
|
||||
MISSING_CASE(port);
|
||||
MISSING_CASE(phy);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -1492,9 +1492,7 @@ void intel_pps_unlock_regs_wa(struct drm_i915_private *dev_priv);
|
|||
void intel_encoder_destroy(struct drm_encoder *encoder);
|
||||
struct drm_display_mode *
|
||||
intel_encoder_current_mode(struct intel_encoder *encoder);
|
||||
bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port);
|
||||
bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy);
|
||||
bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port);
|
||||
bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy);
|
||||
enum tc_port intel_port_to_tc(struct drm_i915_private *dev_priv,
|
||||
enum port port);
|
||||
|
|
Loading…
Reference in a new issue