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.

Signed-off-by: Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index c42b87b..388ac54 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1371,7 +1371,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))
@@ -1399,7 +1399,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))
-- 
1.7.11.7

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to