drm/i915/display: Fix inverted WARN_ON

Restore the previous WARN_ON(cond) so that we don't complain about poor
old Cherryview.

Fixes: eb020ca3d43f ("drm/i915/display/dp: Make WARN* drm specific where drm_device ptr is available")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200223173959.3885742-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 2f93326c16a3ee541440d3c2d6367b54fae9c27f..e8bebd27004d8c2e85cde7709f00735a43199f29 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1023,9 +1023,10 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)
 {
        struct intel_encoder *encoder;
 
-       if (drm_WARN_ON(&dev_priv->drm, !IS_VALLEYVIEW(dev_priv) &&
-                       IS_CHERRYVIEW(dev_priv) &&
-                       !IS_GEN9_LP(dev_priv)))
+       if (drm_WARN_ON(&dev_priv->drm,
+                       !(IS_VALLEYVIEW(dev_priv) ||
+                         IS_CHERRYVIEW(dev_priv) ||
+                         IS_GEN9_LP(dev_priv))))
                return;
 
        /*