Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/i915: Extract intel_encoder_has_connectors() 



We have an open coded loop which tries to see if the encoder has any
connectors linked to it. Let's extract that to a helper similar to
intel_crtc_has_encoders().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1455737325-14777-1-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e28661bd

drivers/gpu/drm/i915/intel_display.c

+12 −10
Original line number Diff line number Diff line
@@ -15460,6 +15460,17 @@ static bool intel_crtc_has_encoders(struct intel_crtc *crtc) 
	return false;

}



static bool intel_encoder_has_connectors(struct intel_encoder *encoder)

{

	struct drm_device *dev = encoder->base.dev;

	struct intel_connector *connector;



	for_each_connector_on_encoder(dev, &encoder->base, connector)

		return true;



	return false;

}



static void intel_sanitize_crtc(struct intel_crtc *crtc)

{

	struct drm_device *dev = crtc->base.dev;
@@ -15570,7 +15581,6 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) 
{

	struct intel_connector *connector;

	struct drm_device *dev = encoder->base.dev;

	bool active = false;



	/* We need to check both for a crtc link (meaning that the

	 * encoder is active and trying to read from a pipe) and the
@@ -15578,15 +15588,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder) 
	bool has_active_crtc = encoder->base.crtc &&

		to_intel_crtc(encoder->base.crtc)->active;



	for_each_intel_connector(dev, connector) {

		if (connector->base.encoder != &encoder->base)

			continue;



		active = true;

		break;

	}



	if (active && !has_active_crtc) {

	if (intel_encoder_has_connectors(encoder) && !has_active_crtc) {

		DRM_DEBUG_KMS("[ENCODER:%d:%s] has active connectors but no active pipe!\n",

			      encoder->base.base.id,

			      encoder->base.name);