Skip to content

L
linux
Commit cca0502b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files
Options

drm/i915: s/INTEL_OUTPUT_DISPLAYPORT/INTEL_OUTPUT_DP/ 

INTEL_OUTPUT_DISPLAYPORT hsa been bugging me for a long time. It always
looks out of place besides INTEL_OUTPUT_EDP and INTEL_OUTPUT_DP_MST.
Let's just rename it to INTEL_OUTPUT_DP.

v2: Rebase
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466621833-5054-9-git-send-email-ville.syrjala@linux.intel.com
parent 2210ce7f
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
drivers/gpu/drm/i915/i915_debugfs.c
View file @ cca0502b
...@@ -3774,7 +3774,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe, ...@@ -3774,7 +3774,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_device *dev, enum pipe pipe,
case INTEL_OUTPUT_TVOUT: case INTEL_OUTPUT_TVOUT:
*source = INTEL_PIPE_CRC_SOURCE_TV; *source = INTEL_PIPE_CRC_SOURCE_TV;
break; break;
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_EDP: case INTEL_OUTPUT_EDP:
dig_port = enc_to_dig_port(&encoder->base); dig_port = enc_to_dig_port(&encoder->base);
switch (dig_port->port) { switch (dig_port->port) {
......
drivers/gpu/drm/i915/intel_ddi.c
View file @ cca0502b
...@@ -318,7 +318,7 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder, ...@@ -318,7 +318,7 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
default: default:
WARN(1, "Invalid DDI encoder type %d\n", intel_encoder->type); WARN(1, "Invalid DDI encoder type %d\n", intel_encoder->type);
/* fallthrough and treat as unknown */ /* fallthrough and treat as unknown */
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_EDP: case INTEL_OUTPUT_EDP:
case INTEL_OUTPUT_HDMI: case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_UNKNOWN: case INTEL_OUTPUT_UNKNOWN:
...@@ -482,7 +482,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder) ...@@ -482,7 +482,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
ddi_translations = ddi_translations_edp; ddi_translations = ddi_translations_edp;
size = n_edp_entries; size = n_edp_entries;
break; break;
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_HDMI: case INTEL_OUTPUT_HDMI:
ddi_translations = ddi_translations_dp; ddi_translations = ddi_translations_dp;
size = n_dp_entries; size = n_dp_entries;
...@@ -1068,7 +1068,7 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc) ...@@ -1068,7 +1068,7 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc)
int type = intel_encoder->type; int type = intel_encoder->type;
uint32_t temp; uint32_t temp;
if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP || type == INTEL_OUTPUT_DP_MST) { if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP || type == INTEL_OUTPUT_DP_MST) {
WARN_ON(transcoder_is_dsi(cpu_transcoder)); WARN_ON(transcoder_is_dsi(cpu_transcoder));
temp = TRANS_MSA_SYNC_CLK; temp = TRANS_MSA_SYNC_CLK;
...@@ -1182,7 +1182,7 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc) ...@@ -1182,7 +1182,7 @@ void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc)
temp |= TRANS_DDI_MODE_SELECT_FDI; temp |= TRANS_DDI_MODE_SELECT_FDI;
temp |= (intel_crtc->config->fdi_lanes - 1) << 1; temp |= (intel_crtc->config->fdi_lanes - 1) << 1;
} else if (type == INTEL_OUTPUT_DISPLAYPORT || } else if (type == INTEL_OUTPUT_DP ||
type == INTEL_OUTPUT_EDP) { type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
...@@ -1392,7 +1392,7 @@ static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv, ...@@ -1392,7 +1392,7 @@ static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
dp_iboost = dev_priv->vbt.ddi_port_info[port].dp_boost_level; dp_iboost = dev_priv->vbt.ddi_port_info[port].dp_boost_level;
hdmi_iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level; hdmi_iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level;
if (type == INTEL_OUTPUT_DISPLAYPORT) { if (type == INTEL_OUTPUT_DP) {
if (dp_iboost) { if (dp_iboost) {
iboost = dp_iboost; iboost = dp_iboost;
} else { } else {
...@@ -1450,7 +1450,7 @@ static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv, ...@@ -1450,7 +1450,7 @@ static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv,
if (type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.low_vswing) { if (type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.low_vswing) {
n_entries = ARRAY_SIZE(bxt_ddi_translations_edp); n_entries = ARRAY_SIZE(bxt_ddi_translations_edp);
ddi_translations = bxt_ddi_translations_edp; ddi_translations = bxt_ddi_translations_edp;
} else if (type == INTEL_OUTPUT_DISPLAYPORT } else if (type == INTEL_OUTPUT_DP
|| type == INTEL_OUTPUT_EDP) { || type == INTEL_OUTPUT_EDP) {
n_entries = ARRAY_SIZE(bxt_ddi_translations_dp); n_entries = ARRAY_SIZE(bxt_ddi_translations_dp);
ddi_translations = bxt_ddi_translations_dp; ddi_translations = bxt_ddi_translations_dp;
...@@ -1624,7 +1624,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder) ...@@ -1624,7 +1624,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
intel_ddi_clk_select(intel_encoder, crtc->config); intel_ddi_clk_select(intel_encoder, crtc->config);
if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) { if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
intel_dp_set_link_params(intel_dp, crtc->config); intel_dp_set_link_params(intel_dp, crtc->config);
...@@ -1669,7 +1669,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder) ...@@ -1669,7 +1669,7 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
if (wait) if (wait)
intel_wait_ddi_buf_idle(dev_priv, port); intel_wait_ddi_buf_idle(dev_priv, port);
if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) { if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP) {
struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
intel_edp_panel_vdd_on(intel_dp); intel_edp_panel_vdd_on(intel_dp);
......
drivers/gpu/drm/i915/intel_display.c
View file @ cca0502b
...@@ -4040,7 +4040,7 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc) ...@@ -4040,7 +4040,7 @@ intel_trans_dp_port_sel(struct drm_crtc *crtc)
struct intel_encoder *encoder; struct intel_encoder *encoder;
for_each_encoder_on_crtc(dev, crtc, encoder) { for_each_encoder_on_crtc(dev, crtc, encoder) {
if (encoder->type == INTEL_OUTPUT_DISPLAYPORT || if (encoder->type == INTEL_OUTPUT_DP ||
encoder->type == INTEL_OUTPUT_EDP) encoder->type == INTEL_OUTPUT_EDP)
return enc_to_dig_port(&encoder->base)->port; return enc_to_dig_port(&encoder->base)->port;
} }
...@@ -5128,7 +5128,7 @@ intel_display_port_power_domain(struct intel_encoder *intel_encoder) ...@@ -5128,7 +5128,7 @@ intel_display_port_power_domain(struct intel_encoder *intel_encoder)
case INTEL_OUTPUT_UNKNOWN: case INTEL_OUTPUT_UNKNOWN:
/* Only DDI platforms should ever use this output type */ /* Only DDI platforms should ever use this output type */
WARN_ON_ONCE(!HAS_DDI(dev)); WARN_ON_ONCE(!HAS_DDI(dev));
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_HDMI: case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP: case INTEL_OUTPUT_EDP:
intel_dig_port = enc_to_dig_port(&intel_encoder->base); intel_dig_port = enc_to_dig_port(&intel_encoder->base);
...@@ -5162,7 +5162,7 @@ intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder) ...@@ -5162,7 +5162,7 @@ intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder)
* run the DP detection too. * run the DP detection too.
*/ */
WARN_ON_ONCE(!HAS_DDI(dev)); WARN_ON_ONCE(!HAS_DDI(dev));
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_EDP: case INTEL_OUTPUT_EDP:
intel_dig_port = enc_to_dig_port(&intel_encoder->base); intel_dig_port = enc_to_dig_port(&intel_encoder->base);
return port_to_aux_power_domain(intel_dig_port->port); return port_to_aux_power_domain(intel_dig_port->port);
...@@ -12377,7 +12377,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state) ...@@ -12377,7 +12377,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
case INTEL_OUTPUT_UNKNOWN: case INTEL_OUTPUT_UNKNOWN:
if (WARN_ON(!HAS_DDI(dev))) if (WARN_ON(!HAS_DDI(dev)))
break; break;
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_HDMI: case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP: case INTEL_OUTPUT_EDP:
port_mask = 1 << enc_to_dig_port(&encoder->base)->port; port_mask = 1 << enc_to_dig_port(&encoder->base)->port;
......
drivers/gpu/drm/i915/intel_dp.c
View file @ cca0502b
...@@ -4250,7 +4250,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) ...@@ -4250,7 +4250,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
} }
if (intel_encoder->type != INTEL_OUTPUT_EDP) if (intel_encoder->type != INTEL_OUTPUT_EDP)
intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT; intel_encoder->type = INTEL_OUTPUT_DP;
intel_dp_probe_oui(intel_dp); intel_dp_probe_oui(intel_dp);
...@@ -4326,7 +4326,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) ...@@ -4326,7 +4326,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)
/* MST devices are disconnected from a monitor POV */ /* MST devices are disconnected from a monitor POV */
intel_dp_unset_edid(intel_dp); intel_dp_unset_edid(intel_dp);
if (intel_encoder->type != INTEL_OUTPUT_EDP) if (intel_encoder->type != INTEL_OUTPUT_EDP)
intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT; intel_encoder->type = INTEL_OUTPUT_DP;
return connector_status_disconnected; return connector_status_disconnected;
} }
...@@ -4365,7 +4365,7 @@ intel_dp_force(struct drm_connector *connector) ...@@ -4365,7 +4365,7 @@ intel_dp_force(struct drm_connector *connector)
intel_display_power_put(dev_priv, power_domain); intel_display_power_put(dev_priv, power_domain);
if (intel_encoder->type != INTEL_OUTPUT_EDP) if (intel_encoder->type != INTEL_OUTPUT_EDP)
intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT; intel_encoder->type = INTEL_OUTPUT_DP;
} }
static int intel_dp_get_modes(struct drm_connector *connector) static int intel_dp_get_modes(struct drm_connector *connector)
...@@ -4678,7 +4678,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) ...@@ -4678,7 +4678,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
if (intel_dig_port->base.type != INTEL_OUTPUT_EDP && if (intel_dig_port->base.type != INTEL_OUTPUT_EDP &&
intel_dig_port->base.type != INTEL_OUTPUT_HDMI) intel_dig_port->base.type != INTEL_OUTPUT_HDMI)
intel_dig_port->base.type = INTEL_OUTPUT_DISPLAYPORT; intel_dig_port->base.type = INTEL_OUTPUT_DP;
if (long_hpd && intel_dig_port->base.type == INTEL_OUTPUT_EDP) { if (long_hpd && intel_dig_port->base.type == INTEL_OUTPUT_EDP) {
/* /*
...@@ -5694,7 +5694,7 @@ bool intel_dp_init(struct drm_device *dev, ...@@ -5694,7 +5694,7 @@ bool intel_dp_init(struct drm_device *dev,
intel_dig_port->dp.output_reg = output_reg; intel_dig_port->dp.output_reg = output_reg;
intel_dig_port->max_lanes = 4; intel_dig_port->max_lanes = 4;
intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT; intel_encoder->type = INTEL_OUTPUT_DP;
if (IS_CHERRYVIEW(dev)) { if (IS_CHERRYVIEW(dev)) {
if (port == PORT_D) if (port == PORT_D)
intel_encoder->crtc_mask = 1 << 2; intel_encoder->crtc_mask = 1 << 2;
......
drivers/gpu/drm/i915/intel_dpll_mgr.c
View file @ cca0502b
...@@ -713,7 +713,7 @@ hsw_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, ...@@ -713,7 +713,7 @@ hsw_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
pll = intel_find_shared_dpll(crtc, crtc_state, pll = intel_find_shared_dpll(crtc, crtc_state,
DPLL_ID_WRPLL1, DPLL_ID_WRPLL2); DPLL_ID_WRPLL1, DPLL_ID_WRPLL2);
} else if (encoder->type == INTEL_OUTPUT_DISPLAYPORT || } else if (encoder->type == INTEL_OUTPUT_DP ||
encoder->type == INTEL_OUTPUT_DP_MST || encoder->type == INTEL_OUTPUT_DP_MST ||
encoder->type == INTEL_OUTPUT_EDP) { encoder->type == INTEL_OUTPUT_EDP) {
enum intel_dpll_id pll_id; enum intel_dpll_id pll_id;
...@@ -1226,7 +1226,7 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, ...@@ -1226,7 +1226,7 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
DPLL_CFGCR2_KDIV(wrpll_params.kdiv) | DPLL_CFGCR2_KDIV(wrpll_params.kdiv) |
DPLL_CFGCR2_PDIV(wrpll_params.pdiv) | DPLL_CFGCR2_PDIV(wrpll_params.pdiv) |
wrpll_params.central_freq; wrpll_params.central_freq;
} else if (encoder->type == INTEL_OUTPUT_DISPLAYPORT || } else if (encoder->type == INTEL_OUTPUT_DP ||
encoder->type == INTEL_OUTPUT_DP_MST || encoder->type == INTEL_OUTPUT_DP_MST ||
encoder->type == INTEL_OUTPUT_EDP) { encoder->type == INTEL_OUTPUT_EDP) {
switch (crtc_state->port_clock / 2) { switch (crtc_state->port_clock / 2) {
...@@ -1534,7 +1534,7 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, ...@@ -1534,7 +1534,7 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
clk_div.m2_frac_en = clk_div.m2_frac != 0; clk_div.m2_frac_en = clk_div.m2_frac != 0;
vco = best_clock.vco; vco = best_clock.vco;
} else if (encoder->type == INTEL_OUTPUT_DISPLAYPORT || } else if (encoder->type == INTEL_OUTPUT_DP ||
encoder->type == INTEL_OUTPUT_EDP) { encoder->type == INTEL_OUTPUT_EDP) {
int i; int i;
......
drivers/gpu/drm/i915/intel_drv.h
View file @ cca0502b
...@@ -159,7 +159,7 @@ enum intel_output_type { ...@@ -159,7 +159,7 @@ enum intel_output_type {
INTEL_OUTPUT_LVDS = 4, INTEL_OUTPUT_LVDS = 4,
INTEL_OUTPUT_TVOUT = 5, INTEL_OUTPUT_TVOUT = 5,
INTEL_OUTPUT_HDMI = 6, INTEL_OUTPUT_HDMI = 6,
INTEL_OUTPUT_DISPLAYPORT = 7, INTEL_OUTPUT_DP = 7,
INTEL_OUTPUT_EDP = 8, INTEL_OUTPUT_EDP = 8,
INTEL_OUTPUT_DSI = 9, INTEL_OUTPUT_DSI = 9,
INTEL_OUTPUT_UNKNOWN = 10, INTEL_OUTPUT_UNKNOWN = 10,
...@@ -1198,7 +1198,7 @@ static inline bool ...@@ -1198,7 +1198,7 @@ static inline bool
intel_crtc_has_dp_encoder(const struct intel_crtc_state *crtc_state) intel_crtc_has_dp_encoder(const struct intel_crtc_state *crtc_state)
{ {
return crtc_state->output_types & return crtc_state->output_types &
((1 << INTEL_OUTPUT_DISPLAYPORT) | ((1 << INTEL_OUTPUT_DP) |
(1 << INTEL_OUTPUT_DP_MST) | (1 << INTEL_OUTPUT_DP_MST) |
(1 << INTEL_OUTPUT_EDP)); (1 << INTEL_OUTPUT_EDP));
} }
......
drivers/gpu/drm/i915/intel_opregion.c
View file @ cca0502b
...@@ -383,7 +383,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, ...@@ -383,7 +383,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
type = DISPLAY_TYPE_CRT; type = DISPLAY_TYPE_CRT;
break; break;
case INTEL_OUTPUT_UNKNOWN: case INTEL_OUTPUT_UNKNOWN:
case INTEL_OUTPUT_DISPLAYPORT: case INTEL_OUTPUT_DP:
case INTEL_OUTPUT_HDMI: case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_DP_MST: case INTEL_OUTPUT_DP_MST:
type = DISPLAY_TYPE_EXTERNAL_FLAT_PANEL; type = DISPLAY_TYPE_EXTERNAL_FLAT_PANEL;
......
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