Commit 981329ce authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191002162505.30716-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 2b0b2741

drivers/gpu/drm/i915/display/icl_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/intel_crt.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) &

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/gpu/drm/i915/display/intel_display_types.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE