Commit fa5c73b1 authored by Daniel Vetter's avatar Daniel Vetter

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
...@@ -3267,10 +3267,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) ...@@ -3267,10 +3267,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
intel_crtc_update_cursor(crtc, true); intel_crtc_update_cursor(crtc, true);
encoders: encoders:
for_each_encoder_on_crtc(dev, crtc, encoder) { for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->enable) encoder->enable(encoder);
encoder->enable(encoder);
}
} }
static void ironlake_crtc_disable(struct drm_crtc *crtc) static void ironlake_crtc_disable(struct drm_crtc *crtc)
...@@ -3285,10 +3283,8 @@ 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 /* XXX: For compatability with the crtc helper code, call the encoder's
* disable function unconditionally for now. */ * disable function unconditionally for now. */
for_each_encoder_on_crtc(dev, crtc, encoder) { for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->disable) encoder->disable(encoder);
encoder->disable(encoder);
}
if (!intel_crtc->active) if (!intel_crtc->active)
return; return;
...@@ -3412,10 +3408,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) ...@@ -3412,10 +3408,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
intel_crtc_update_cursor(crtc, true); intel_crtc_update_cursor(crtc, true);
encoders: encoders:
for_each_encoder_on_crtc(dev, crtc, encoder) { for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->enable) encoder->enable(encoder);
encoder->enable(encoder);
}
} }
static void i9xx_crtc_disable(struct drm_crtc *crtc) static void i9xx_crtc_disable(struct drm_crtc *crtc)
...@@ -3429,10 +3423,8 @@ 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 /* XXX: For compatability with the crtc helper code, call the encoder's
* disable function unconditionally for now. */ * disable function unconditionally for now. */
for_each_encoder_on_crtc(dev, crtc, encoder) { for_each_encoder_on_crtc(dev, crtc, encoder)
if (encoder->disable) encoder->disable(encoder);
encoder->disable(encoder);
}
if (!intel_crtc->active) if (!intel_crtc->active)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment