Op 03-08-15 om 22:09 schreef Jesse Barnes: > Looks like > > commit eddfcbcdc27fbecb33bff098967bbdd7ca75bfa6 > Author: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Date: Mon Jun 15 12:33:53 2015 +0200 > drm/i915: Update less state during modeset. > > introduced the unconditional calling of disable_shared_dpll, but didn't > fix up pre-gen5 to avoid the BUG_ON at the top of the function. > > So change the BUG_ON into a gen check (alternately we could move the > BUG_ON until later, since we shouldn't have a pll struct here either, > but this seems clearer to read). > > This fixes a crash on load on my x200s platform. > > Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 43b0f17..b5e79b3 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1936,7 +1936,9 @@ static void intel_disable_shared_dpll(struct intel_crtc *crtc) > struct intel_shared_dpll *pll = intel_crtc_to_shared_dpll(crtc); > > /* PCH only available on ILK+ */ > - BUG_ON(INTEL_INFO(dev)->gen < 5); > + if (INTEL_INFO(dev)->gen < 5) > + return; > + > if (pll == NULL) > return; > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> Intel test bot doesn't run on < ilk? :( _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
