leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Daniel Vetter 2012-07-01 23:24:36 +02:00
parent b2cabb0e1d
commit fa5c73b1b2
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/i915/intel_display.c
View File

@ -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)
@ -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;
@ -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)
@ -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;