lkml.org 
[lkml]   [2018]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RESEND PATCH v2 2/2] drm/i915/mst: Reset MST after resume when necessary
Date
From: Lyude <cpaul@redhat.com>

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@vger.kernel.org
Signed-off-by: Lyude <cpaul@redhat.com>
Signed-off-by: Juston Li <juston.li@intel.com>
---
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
\
 
 \ /
  Last update: 2018-10-24 04:50    [W:0.083 / U:17.684 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site