From: Lyude <cpaul@xxxxxxxxxx>
A follow-up to the previous commit, we skip checking the status of the
MST device and completely reprobe it if drm_dp_mst_topology_mgr_resume()
returns -EINVAL.
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Lyude <cpaul@xxxxxxxxxx>
Signed-off-by: Juston Li <juston.li@xxxxxxxxx>
---
drivers/gpu/drm/i915/intel_dp.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 8c38efef77a1..cb5ffec73094 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6793,7 +6793,12 @@ void intel_dp_mst_resume(struct drm_i915_private *dev_priv)
continue;
ret = drm_dp_mst_topology_mgr_resume(&intel_dp->mst_mgr);
- if (ret)
+ /* A full reset is required */
+ if (ret == -EINVAL) {
+ drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, false);
+ intel_dp_configure_mst(intel_dp);
+ } else if (ret != 0) {
intel_dp_check_mst_status(intel_dp);
+ }
}
}
--
2.17.2
