Commit a2ab4ab6 authored by Chris Wilson's avatar Chris Wilson

drm/i915/display: Fix inverted WARN_ON

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

Fixes: eb020ca3 ("drm/i915/display/dp: Make WARN* drm specific where drm_device ptr is available")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200223173959.3885742-1-chris@chris-wilson.co.uk
parent bb393dc5
...@@ -1023,9 +1023,10 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv) ...@@ -1023,9 +1023,10 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)
{ {
struct intel_encoder *encoder; struct intel_encoder *encoder;
if (drm_WARN_ON(&dev_priv->drm, !IS_VALLEYVIEW(dev_priv) && if (drm_WARN_ON(&dev_priv->drm,
IS_CHERRYVIEW(dev_priv) && !(IS_VALLEYVIEW(dev_priv) ||
!IS_GEN9_LP(dev_priv))) IS_CHERRYVIEW(dev_priv) ||
IS_GEN9_LP(dev_priv))))
return; return;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment