diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4805385a49ed..07077b1fcd7b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -3269,6 +3269,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) | |||
3269 | encoders: | 3269 | encoders: |
3270 | for_each_encoder_on_crtc(dev, crtc, encoder) | 3270 | for_each_encoder_on_crtc(dev, crtc, encoder) |
3271 | encoder->enable(encoder); | 3271 | encoder->enable(encoder); |
3272 | |||
3273 | if (HAS_PCH_CPT(dev)) | ||
3274 | intel_cpt_verify_modeset(dev, intel_crtc->pipe); | ||
3272 | } | 3275 | } |
3273 | 3276 | ||
3274 | static void ironlake_crtc_disable(struct drm_crtc *crtc) | 3277 | static void ironlake_crtc_disable(struct drm_crtc *crtc) |
@@ -3524,26 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) | |||
3524 | } | 3527 | } |
3525 | } | 3528 | } |
3526 | 3529 | ||
3527 | void intel_encoder_prepare(struct drm_encoder *encoder) | ||
3528 | { | ||
3529 | struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; | ||
3530 | /* lvds has its own version of prepare see intel_lvds_prepare */ | ||
3531 | encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF); | ||
3532 | } | ||
3533 | |||
3534 | void intel_encoder_commit(struct drm_encoder *encoder) | ||
3535 | { | ||
3536 | struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; | ||
3537 | struct drm_device *dev = encoder->dev; | ||
3538 | struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); | ||
3539 | |||
3540 | /* lvds has its own version of commit see intel_lvds_commit */ | ||
3541 | encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); | ||
3542 | |||
3543 | if (HAS_PCH_CPT(dev)) | ||
3544 | intel_cpt_verify_modeset(dev, intel_crtc->pipe); | ||
3545 | } | ||
3546 | |||
3547 | void intel_encoder_noop(struct drm_encoder *encoder) | 3530 | void intel_encoder_noop(struct drm_encoder *encoder) |
3548 | { | 3531 | { |
3549 | } | 3532 | } |