| Message ID | 1370432073-27634-29-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2013-06-05 at 13:34 +0200, Daniel Vetter wrote: > i9xx doesn't use pre_enable at all, so we can fold this in now. > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> I managed to review 23-28 for now, so on those apart from the two nitpicks: Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 13 +++---------- > drivers/gpu/drm/i915/intel_lvds.c | 4 ++-- > 2 files changed, 5 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index b6f5e48..2e30f45 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3157,12 +3157,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) > > intel_update_watermarks(dev); > > - for_each_encoder_on_crtc(dev, crtc, encoder) { > - if (encoder->pre_pll_enable) > - encoder->pre_pll_enable(encoder); > + for_each_encoder_on_crtc(dev, crtc, encoder) > if (encoder->pre_enable) > encoder->pre_enable(encoder); > - } > > if (intel_crtc->config.has_pch_encoder) { > /* Note: FDI PLL enabling _must_ be done before we enable the > @@ -3608,15 +3605,11 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) > intel_update_watermarks(dev); > > for_each_encoder_on_crtc(dev, crtc, encoder) > - if (encoder->pre_pll_enable) > - encoder->pre_pll_enable(encoder); > - > - i9xx_enable_pll(intel_crtc); > - > - for_each_encoder_on_crtc(dev, crtc, encoder) > if (encoder->pre_enable) > encoder->pre_enable(encoder); > > + i9xx_enable_pll(intel_crtc); > + > /* Enable panel fitting for LVDS */ > i9xx_pfit_enable(intel_crtc); > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c > index 36f8901..b2a4894 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -115,7 +115,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, > * This is an exception to the general rule that mode_set doesn't turn > * things on. > */ > -static void intel_pre_pll_enable_lvds(struct intel_encoder *encoder) > +static void intel_pre_enable_lvds(struct intel_encoder *encoder) > { > struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); > struct drm_device *dev = encoder->base.dev; > @@ -946,7 +946,7 @@ bool intel_lvds_init(struct drm_device *dev) > DRM_MODE_ENCODER_LVDS); > > intel_encoder->enable = intel_enable_lvds; > - intel_encoder->pre_pll_enable = intel_pre_pll_enable_lvds; > + intel_encoder->pre_enable = intel_pre_enable_lvds; > intel_encoder->compute_config = intel_lvds_compute_config; > intel_encoder->disable = intel_disable_lvds; > intel_encoder->get_hw_state = intel_lvds_get_hw_state;
On Sat, Jun 15, 2013 at 11:32:51AM +0300, Imre Deak wrote: > On Wed, 2013-06-05 at 13:34 +0200, Daniel Vetter wrote: > > i9xx doesn't use pre_enable at all, so we can fold this in now. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > I managed to review 23-28 for now, so on those apart from the two > nitpicks: > > Reviewed-by: Imre Deak <imre.deak@intel.com> Merged up to patch 28, thanks for the review. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b6f5e48..2e30f45 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3157,12 +3157,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) intel_update_watermarks(dev); - for_each_encoder_on_crtc(dev, crtc, encoder) { - if (encoder->pre_pll_enable) - encoder->pre_pll_enable(encoder); + for_each_encoder_on_crtc(dev, crtc, encoder) if (encoder->pre_enable) encoder->pre_enable(encoder); - } if (intel_crtc->config.has_pch_encoder) { /* Note: FDI PLL enabling _must_ be done before we enable the @@ -3608,15 +3605,11 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) intel_update_watermarks(dev); for_each_encoder_on_crtc(dev, crtc, encoder) - if (encoder->pre_pll_enable) - encoder->pre_pll_enable(encoder); - - i9xx_enable_pll(intel_crtc); - - for_each_encoder_on_crtc(dev, crtc, encoder) if (encoder->pre_enable) encoder->pre_enable(encoder); + i9xx_enable_pll(intel_crtc); + /* Enable panel fitting for LVDS */ i9xx_pfit_enable(intel_crtc); diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 36f8901..b2a4894 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -115,7 +115,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, * This is an exception to the general rule that mode_set doesn't turn * things on. */ -static void intel_pre_pll_enable_lvds(struct intel_encoder *encoder) +static void intel_pre_enable_lvds(struct intel_encoder *encoder) { struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(&encoder->base); struct drm_device *dev = encoder->base.dev; @@ -946,7 +946,7 @@ bool intel_lvds_init(struct drm_device *dev) DRM_MODE_ENCODER_LVDS); intel_encoder->enable = intel_enable_lvds; - intel_encoder->pre_pll_enable = intel_pre_pll_enable_lvds; + intel_encoder->pre_enable = intel_pre_enable_lvds; intel_encoder->compute_config = intel_lvds_compute_config; intel_encoder->disable = intel_disable_lvds; intel_encoder->get_hw_state = intel_lvds_get_hw_state;
i9xx doesn't use pre_enable at all, so we can fold this in now. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/intel_display.c | 13 +++---------- drivers/gpu/drm/i915/intel_lvds.c | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-)