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: s/crtc_mask/pipe_mask/
Rename the encoder->crtc_mask to encoder->pipe_mask to better reflect what it actually contains. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191002162505.30716-3-ville.syrjala@linux.intel.com Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
This commit is contained in:
parent
2b0b27418a
commit
981329ce3c
13 changed files with 22 additions and 22 deletions
|
@ -1584,7 +1584,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
|
|||
encoder->get_hw_state = gen11_dsi_get_hw_state;
|
||||
encoder->type = INTEL_OUTPUT_DSI;
|
||||
encoder->cloneable = 0;
|
||||
encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
encoder->power_domain = POWER_DOMAIN_PORT_DSI;
|
||||
encoder->get_power_domains = gen11_dsi_get_power_domains;
|
||||
|
||||
|
|
|
@ -1001,9 +1001,9 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
|
|||
crt->base.type = INTEL_OUTPUT_ANALOG;
|
||||
crt->base.cloneable = (1 << INTEL_OUTPUT_DVO) | (1 << INTEL_OUTPUT_HDMI);
|
||||
if (IS_I830(dev_priv))
|
||||
crt->base.crtc_mask = BIT(PIPE_A);
|
||||
crt->base.pipe_mask = BIT(PIPE_A);
|
||||
else
|
||||
crt->base.crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
crt->base.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
|
||||
if (IS_GEN(dev_priv, 2))
|
||||
connector->interlace_allowed = 0;
|
||||
|
|
|
@ -4741,7 +4741,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
|
|||
intel_encoder->port = port;
|
||||
intel_encoder->cloneable = 0;
|
||||
for_each_pipe(dev_priv, pipe)
|
||||
intel_encoder->crtc_mask |= BIT(pipe);
|
||||
intel_encoder->pipe_mask |= BIT(pipe);
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 11)
|
||||
intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
|
||||
|
|
|
@ -15842,7 +15842,7 @@ static u32 intel_encoder_possible_crtcs(struct intel_encoder *encoder)
|
|||
u32 possible_crtcs = 0;
|
||||
|
||||
for_each_intel_crtc(dev, crtc) {
|
||||
if (encoder->crtc_mask & BIT(crtc->pipe))
|
||||
if (encoder->pipe_mask & BIT(crtc->pipe))
|
||||
possible_crtcs |= drm_crtc_mask(&crtc->base);
|
||||
}
|
||||
|
||||
|
|
|
@ -128,7 +128,8 @@ struct intel_encoder {
|
|||
|
||||
enum intel_output_type type;
|
||||
enum port port;
|
||||
unsigned int cloneable;
|
||||
u16 cloneable;
|
||||
u8 pipe_mask;
|
||||
enum intel_hotplug_state (*hotplug)(struct intel_encoder *encoder,
|
||||
struct intel_connector *connector,
|
||||
bool irq_received);
|
||||
|
@ -187,7 +188,6 @@ struct intel_encoder {
|
|||
* device interrupts are disabled.
|
||||
*/
|
||||
void (*suspend)(struct intel_encoder *);
|
||||
int crtc_mask;
|
||||
enum hpd_pin hpd_pin;
|
||||
enum intel_display_power_domain power_domain;
|
||||
/* for communication with audio component; protected by av_mutex */
|
||||
|
|
|
@ -7571,11 +7571,11 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
|
|||
intel_encoder->power_domain = intel_port_to_power_domain(port);
|
||||
if (IS_CHERRYVIEW(dev_priv)) {
|
||||
if (port == PORT_D)
|
||||
intel_encoder->crtc_mask = BIT(PIPE_C);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_C);
|
||||
else
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
} else {
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
}
|
||||
intel_encoder->cloneable = 0;
|
||||
intel_encoder->port = port;
|
||||
|
|
|
@ -618,7 +618,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
|
|||
intel_encoder->port = intel_dig_port->base.port;
|
||||
intel_encoder->cloneable = 0;
|
||||
for_each_pipe(dev_priv, pipe_iter)
|
||||
intel_encoder->crtc_mask |= BIT(pipe_iter);
|
||||
intel_encoder->pipe_mask |= BIT(pipe_iter);
|
||||
|
||||
intel_encoder->compute_config = intel_dp_mst_compute_config;
|
||||
intel_encoder->disable = intel_mst_disable_dp;
|
||||
|
|
|
@ -505,7 +505,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
|
|||
intel_encoder->type = INTEL_OUTPUT_DVO;
|
||||
intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
|
||||
intel_encoder->port = port;
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
|
||||
switch (dvo->type) {
|
||||
case INTEL_DVO_CHIP_TMDS:
|
||||
|
|
|
@ -3283,11 +3283,11 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
|
|||
intel_encoder->port = port;
|
||||
if (IS_CHERRYVIEW(dev_priv)) {
|
||||
if (port == PORT_D)
|
||||
intel_encoder->crtc_mask = BIT(PIPE_C);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_C);
|
||||
else
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
} else {
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
}
|
||||
intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
|
||||
/*
|
||||
|
|
|
@ -900,9 +900,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
|
|||
intel_encoder->port = PORT_NONE;
|
||||
intel_encoder->cloneable = 0;
|
||||
if (INTEL_GEN(dev_priv) < 4)
|
||||
intel_encoder->crtc_mask = BIT(PIPE_B);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_B);
|
||||
else
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
|
||||
drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs);
|
||||
connector->display_info.subpixel_order = SubPixelHorizontalRGB;
|
||||
|
|
|
@ -2921,7 +2921,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
|
|||
bytes[0], bytes[1]);
|
||||
return false;
|
||||
}
|
||||
intel_sdvo->base.crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
intel_sdvo->base.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1947,7 +1947,7 @@ intel_tv_init(struct drm_i915_private *dev_priv)
|
|||
intel_encoder->type = INTEL_OUTPUT_TVOUT;
|
||||
intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
|
||||
intel_encoder->port = PORT_NONE;
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
|
||||
intel_encoder->cloneable = 0;
|
||||
intel_tv->type = DRM_MODE_CONNECTOR_Unknown;
|
||||
|
||||
|
|
|
@ -1870,11 +1870,11 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
|
|||
* port C. BXT isn't limited like this.
|
||||
*/
|
||||
if (IS_GEN9_LP(dev_priv))
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
|
||||
else if (port == PORT_A)
|
||||
intel_encoder->crtc_mask = BIT(PIPE_A);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_A);
|
||||
else
|
||||
intel_encoder->crtc_mask = BIT(PIPE_B);
|
||||
intel_encoder->pipe_mask = BIT(PIPE_B);
|
||||
|
||||
if (dev_priv->vbt.dsi.config->dual_link)
|
||||
intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);
|
||||
|
|
Loading…
Reference in a new issue