diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-04-11 17:33:49 +0300 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-04-12 16:35:50 +0300 |
commit | e5604e2fb6d440d91f8f729fa5424cc93c802c76 (patch) | |
tree | 75a026adee6e01912a436498a10ebf25525652d0 | |
parent | 7a412b8f60cd57ab7dcb72ab701fde2bf81752eb (diff) | |
download | linux-stable-e5604e2fb6d440d91f8f729fa5424cc93c802c76.tar.gz linux-stable-e5604e2fb6d440d91f8f729fa5424cc93c802c76.tar.bz2 linux-stable-e5604e2fb6d440d91f8f729fa5424cc93c802c76.zip |
drm/i915: Suppress spurious combo PHY B warning
On ICL the DMC doesn't reinit combo PHY B so we should not warn
about its state being bogus during the display core uninit.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190411143349.17934-1-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_combo_phy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c index 3d0271cebf99..2bf4359d7e41 100644 --- a/drivers/gpu/drm/i915/intel_combo_phy.c +++ b/drivers/gpu/drm/i915/intel_combo_phy.c @@ -239,7 +239,8 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv) for_each_combo_port_reverse(dev_priv, port) { u32 val; - if (!icl_combo_phy_verify_state(dev_priv, port)) + if (port == PORT_A && + !icl_combo_phy_verify_state(dev_priv, port)) DRM_WARN("Port %c combo PHY HW state changed unexpectedly\n", port_name(port)); |