Skip to content

Commit

Permalink
drm/i915: WARN on lack of shared dpll
Browse files Browse the repository at this point in the history
Now that we have proper hw state reconstruction we should never have a
case where we don't have the software dpll state properly set up. So
add WARNs to the respective !pll cases in enable/disabel_shared_dpll.

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Jun 12, 2013
1 parent 91d1b4b commit 87a875b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -1401,7 +1401,7 @@ static void ironlake_enable_shared_dpll(struct intel_crtc *crtc)

/* PCH PLLs only available on ILK, SNB and IVB */
BUG_ON(dev_priv->info->gen < 5);
if (pll == NULL)
if (WARN_ON(pll == NULL))
return;

if (WARN_ON(pll->refcount == 0))
Expand Down Expand Up @@ -1430,7 +1430,7 @@ static void intel_disable_shared_dpll(struct intel_crtc *crtc)

/* PCH only available on ILK+ */
BUG_ON(dev_priv->info->gen < 5);
if (pll == NULL)
if (WARN_ON(pll == NULL))
return;

if (WARN_ON(pll->refcount == 0))
Expand Down

0 comments on commit 87a875b

Please sign in to comment.