Skip to content

Commit

Permalink
drm/i915: Remove BUG_ON call in vlv_enable_pll
Browse files Browse the repository at this point in the history
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@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449529362-18193-1-git-send-email-wayne.boyer@intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
  • Loading branch information
Wayne Boyer authored and Daniel Vetter committed Dec 10, 2015
1 parent 4d3e904 commit 50df29d
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 50df29d

Please sign in to comment.