| Message ID | 1371163883-638-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 14 Jun 2013 00:51:23 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Now that we have this all nicely abstract into separate functions with > self-documenting names this is pointless. And as Yuly Novikov spotted > in the case of ilk-ivb also wrong since we use the pfit both for lvds > and eDP > > Reported-By: Yuly Novikov <ynovikov@chromium.org> > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_display.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index e1184eb..2338279 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3209,7 +3209,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) > assert_fdi_rx_disabled(dev_priv, pipe); > } > > - /* Enable panel fitting for LVDS */ > ironlake_pfit_enable(intel_crtc); > > /* > @@ -3315,7 +3314,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) > > intel_ddi_enable_pipe_clock(intel_crtc); > > - /* Enable panel fitting for eDP */ > ironlake_pfit_enable(intel_crtc); > > /* > @@ -3611,7 +3609,6 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc) > for_each_encoder_on_crtc(dev, crtc, encoder) > encoder->enable(encoder); > > - /* Enable panel fitting for eDP */ > i9xx_pfit_enable(intel_crtc); > > intel_crtc_load_lut(crtc); > @@ -3649,7 +3646,6 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) > > i9xx_enable_pll(intel_crtc); > > - /* Enable panel fitting for LVDS */ > i9xx_pfit_enable(intel_crtc); > > intel_crtc_load_lut(crtc); Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
On Thu, Jun 13, 2013 at 06:19:39PM -0700, Jesse Barnes wrote: > On Fri, 14 Jun 2013 00:51:23 +0200 > Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > > Now that we have this all nicely abstract into separate functions with > > self-documenting names this is pointless. And as Yuly Novikov spotted > > in the case of ilk-ivb also wrong since we use the pfit both for lvds > > and eDP > > > > Reported-By: Yuly Novikov <ynovikov@chromium.org> > > Cc: Jesse Barnes <jbarnes@virtuousgeek.org> > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > --- > > drivers/gpu/drm/i915/intel_display.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index e1184eb..2338279 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -3209,7 +3209,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) > > assert_fdi_rx_disabled(dev_priv, pipe); > > } > > > > - /* Enable panel fitting for LVDS */ > > ironlake_pfit_enable(intel_crtc); > > > > /* > > @@ -3315,7 +3314,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) > > > > intel_ddi_enable_pipe_clock(intel_crtc); > > > > - /* Enable panel fitting for eDP */ > > ironlake_pfit_enable(intel_crtc); > > > > /* > > @@ -3611,7 +3609,6 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc) > > for_each_encoder_on_crtc(dev, crtc, encoder) > > encoder->enable(encoder); > > > > - /* Enable panel fitting for eDP */ > > i9xx_pfit_enable(intel_crtc); > > > > intel_crtc_load_lut(crtc); > > @@ -3649,7 +3646,6 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) > > > > i9xx_enable_pll(intel_crtc); > > > > - /* Enable panel fitting for LVDS */ > > i9xx_pfit_enable(intel_crtc); > > > > intel_crtc_load_lut(crtc); > > Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> And now merged to dinq. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e1184eb..2338279 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3209,7 +3209,6 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) assert_fdi_rx_disabled(dev_priv, pipe); } - /* Enable panel fitting for LVDS */ ironlake_pfit_enable(intel_crtc); /* @@ -3315,7 +3314,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) intel_ddi_enable_pipe_clock(intel_crtc); - /* Enable panel fitting for eDP */ ironlake_pfit_enable(intel_crtc); /* @@ -3611,7 +3609,6 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc) for_each_encoder_on_crtc(dev, crtc, encoder) encoder->enable(encoder); - /* Enable panel fitting for eDP */ i9xx_pfit_enable(intel_crtc); intel_crtc_load_lut(crtc); @@ -3649,7 +3646,6 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc) i9xx_enable_pll(intel_crtc); - /* Enable panel fitting for LVDS */ i9xx_pfit_enable(intel_crtc); intel_crtc_load_lut(crtc);
Now that we have this all nicely abstract into separate functions with self-documenting names this is pointless. And as Yuly Novikov spotted in the case of ilk-ivb also wrong since we use the pfit both for lvds and eDP Reported-By: Yuly Novikov <ynovikov@chromium.org> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/i915/intel_display.c | 4 ---- 1 file changed, 4 deletions(-)