Skip to content

Commit

Permalink
drm/i915: rip out encoder->disable/enable checks
Browse files Browse the repository at this point in the history
All encoders are now converted so there's no need for these checks any
more.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Sep 6, 2012
1 parent b2cabb0 commit fa5c73b
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3267,10 +3267,8 @@ 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)
encoder->enable(encoder);
}
for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->enable(encoder);
}

static void ironlake_crtc_disable(struct drm_crtc *crtc)
Expand All @@ -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)
encoder->disable(encoder);
}
for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->disable(encoder);

if (!intel_crtc->active)
return;
Expand Down Expand Up @@ -3412,10 +3408,8 @@ 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)
encoder->enable(encoder);
}
for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->enable(encoder);
}

static void i9xx_crtc_disable(struct drm_crtc *crtc)
Expand All @@ -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)
encoder->disable(encoder);
}
for_each_encoder_on_crtc(dev, crtc, encoder)
encoder->disable(encoder);

if (!intel_crtc->active)
return;
Expand Down

0 comments on commit fa5c73b

Please sign in to comment.