diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-05 13:34:19 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-06-12 21:31:57 +0200 |
| commit | 87a875bbffcfac7cb7c9a106fda40f04de1f60a2 (patch) | |
| tree | e6873fe20ec7f43438a31f792c9cbc1d58c0b6c4 | |
| parent | 91d1b4bd14fd0bfe87e91a0fd115fcc15c9c9cc5 (diff) | |
| download | blackbird-op-linux-87a875bbffcfac7cb7c9a106fda40f04de1f60a2.tar.gz blackbird-op-linux-87a875bbffcfac7cb7c9a106fda40f04de1f60a2.zip | |
drm/i915: WARN on lack of shared dpll
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0eea23a21f86..cb724b6f8833 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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)) @@ -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)) |
