On Mon, Dec 07, 2015 at 03:02:42PM -0800, Wayne Boyer wrote: > Do some further clean up based on the initial review of > drm/i915: Separate cherryview from valleyview. > > In this case remove the BUG_ON call in vlv_enable_pll(). > > v2: Also remove the BUG_ON call in chv_enable_pll(). (Ville) > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > Signed-off-by: Wayne Boyer <wayne.boyer@xxxxxxxxx> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 05458a6..3c86649 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -1607,9 +1607,6 @@ static void vlv_enable_pll(struct intel_crtc *crtc, > > assert_pipe_disabled(dev_priv, crtc->pipe); > > - /* No really, not for ILK+ */ > - BUG_ON(!IS_VALLEYVIEW(dev_priv->dev)); > - > /* PLL is protected by panel, make sure we can write it */ > if (IS_MOBILE(dev_priv->dev)) > assert_panel_unlocked(dev_priv, crtc->pipe); > @@ -1647,8 +1644,6 @@ static void chv_enable_pll(struct intel_crtc *crtc, > > assert_pipe_disabled(dev_priv, crtc->pipe); > > - BUG_ON(!IS_CHERRYVIEW(dev_priv->dev)); > - > mutex_lock(&dev_priv->sb_lock); > > /* Enable back the 10bit clock to display controller */ > -- > 2.6.3 -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
