| Message ID | 1345403595-9678-14-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sun, 19 Aug 2012 21:12:30 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > We no longer need them. And now that all encoders are converted, we > can finally move the cpt modeset check to the right place - at the end > of the crtc_enable function. > > Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_display.c | 23 +++-------------------- > drivers/gpu/drm/i915/intel_drv.h | 2 -- > 2 files changed, 3 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 4805385..07077b1 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) > encoders: > for_each_encoder_on_crtc(dev, crtc, encoder) > encoder->enable(encoder); > + > + if (HAS_PCH_CPT(dev)) > + intel_cpt_verify_modeset(dev, intel_crtc->pipe); > } > > static void ironlake_crtc_disable(struct drm_crtc *crtc) > @@ -3524,26 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) > } > } > > -void intel_encoder_prepare(struct drm_encoder *encoder) > -{ > - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; > - /* lvds has its own version of prepare see intel_lvds_prepare */ > - encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF); > -} > - > -void intel_encoder_commit(struct drm_encoder *encoder) > -{ > - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; > - struct drm_device *dev = encoder->dev; > - struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); > - > - /* lvds has its own version of commit see intel_lvds_commit */ > - encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); > - > - if (HAS_PCH_CPT(dev)) > - intel_cpt_verify_modeset(dev, intel_crtc->pipe); > -} > - > void intel_encoder_noop(struct drm_encoder *encoder) > { > } > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 2456245..e59cac3 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -412,8 +412,6 @@ extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); > > extern void intel_crtc_load_lut(struct drm_crtc *crtc); > extern void intel_crtc_update_dpms(struct drm_crtc *crtc); > -extern void intel_encoder_prepare(struct drm_encoder *encoder); > -extern void intel_encoder_commit(struct drm_encoder *encoder); > extern void intel_encoder_noop(struct drm_encoder *encoder); > extern void intel_encoder_disable(struct drm_encoder *encoder); > extern void intel_encoder_destroy(struct drm_encoder *encoder); Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4805385..07077b1 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) encoders: for_each_encoder_on_crtc(dev, crtc, encoder) encoder->enable(encoder); + + if (HAS_PCH_CPT(dev)) + intel_cpt_verify_modeset(dev, intel_crtc->pipe); } static void ironlake_crtc_disable(struct drm_crtc *crtc) @@ -3524,26 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc) } } -void intel_encoder_prepare(struct drm_encoder *encoder) -{ - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; - /* lvds has its own version of prepare see intel_lvds_prepare */ - encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF); -} - -void intel_encoder_commit(struct drm_encoder *encoder) -{ - struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; - struct drm_device *dev = encoder->dev; - struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc); - - /* lvds has its own version of commit see intel_lvds_commit */ - encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); - - if (HAS_PCH_CPT(dev)) - intel_cpt_verify_modeset(dev, intel_crtc->pipe); -} - void intel_encoder_noop(struct drm_encoder *encoder) { } diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 2456245..e59cac3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -412,8 +412,6 @@ extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_crtc_update_dpms(struct drm_crtc *crtc); -extern void intel_encoder_prepare(struct drm_encoder *encoder); -extern void intel_encoder_commit(struct drm_encoder *encoder); extern void intel_encoder_noop(struct drm_encoder *encoder); extern void intel_encoder_disable(struct drm_encoder *encoder); extern void intel_encoder_destroy(struct drm_encoder *encoder);
We no longer need them. And now that all encoders are converted, we can finally move the cpt modeset check to the right place - at the end of the crtc_enable function. Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/intel_display.c | 23 +++-------------------- drivers/gpu/drm/i915/intel_drv.h | 2 -- 2 files changed, 3 insertions(+), 22 deletions(-)