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

Commit fa5c73b1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: rip out encoder->disable/enable checks 



All encoders are now converted so there's no need for these checks any
more.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b2cabb0e

drivers/gpu/drm/i915/intel_display.c

+8 −16
Original line number Diff line number Diff line
@@ -3267,11 +3267,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 
	intel_crtc_update_cursor(crtc, true);



encoders:

	for_each_encoder_on_crtc(dev, crtc, encoder) {

		if (encoder->enable)

	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->enable(encoder);

}

}



static void ironlake_crtc_disable(struct drm_crtc *crtc)

{
@@ -3285,10 +3283,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) 


	/* XXX: For compatability with the crtc helper code, call the encoder's

	 * disable function unconditionally for now. */

	for_each_encoder_on_crtc(dev, crtc, encoder) {

		if (encoder->disable)

	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->disable(encoder);

	}



	if (!intel_crtc->active)

		return;
@@ -3412,11 +3408,9 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) 
	intel_crtc_update_cursor(crtc, true);



encoders:

	for_each_encoder_on_crtc(dev, crtc, encoder) {

		if (encoder->enable)

	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->enable(encoder);

}

}



static void i9xx_crtc_disable(struct drm_crtc *crtc)

{
@@ -3429,10 +3423,8 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc) 


	/* XXX: For compatability with the crtc helper code, call the encoder's

	 * disable function unconditionally for now. */

	for_each_encoder_on_crtc(dev, crtc, encoder) {

		if (encoder->disable)

	for_each_encoder_on_crtc(dev, crtc, encoder)

		encoder->disable(encoder);

	}



	if (!intel_crtc->active)

		return;