| Message ID | 1449514270-15171-6-git-send-email-wayne.boyer@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Dec 07, 2015 at 10:51:10AM -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(). Yeah, BUG_ONs aren't very nice. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Wayne Boyer <wayne.boyer@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 05458a6..2b7d27d 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); > -- > 2.6.3
On Mon, Dec 07, 2015 at 09:29:32PM +0200, Ville Syrjälä wrote: > On Mon, Dec 07, 2015 at 10:51:10AM -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(). > > Yeah, BUG_ONs aren't very nice. Hmm. You didn't catch the other one in chv_enable_pll()? > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Signed-off-by: Wayne Boyer <wayne.boyer@intel.com> > > --- > > drivers/gpu/drm/i915/intel_display.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 05458a6..2b7d27d 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); > > -- > > 2.6.3 > > -- > Ville Syrjälä > Intel OTC
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 05458a6..2b7d27d 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);
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(). Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Wayne Boyer <wayne.boyer@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 3 --- 1 file changed, 3 deletions(-)