On Thu, Nov 26, 2015 at 09:40:26AM +0100, Daniel Vetter wrote: > On Wed, Nov 25, 2015 at 04:35:30PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote: > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > ironlake_crtc_compute_clock() gets called during atomic compute phase, > > so we must check the future pipe type instead of the current type. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> Pushed this patch to dinq. Thanks for the review. > > > --- > > drivers/gpu/drm/i915/intel_display.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index a5669a6613e8..26cafeea2845 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -8988,7 +8988,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, > > memset(&crtc_state->dpll_hw_state, 0, > > sizeof(crtc_state->dpll_hw_state)); > > > > - is_lvds = intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS); > > + is_lvds = intel_pipe_will_have_type(crtc_state, INTEL_OUTPUT_LVDS); > > > > WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)), > > "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev)); > > -- > > 2.4.10 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
