All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juston Li <juston.li@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: mario.limonciello@dell.com, linux-kernel@vger.kernel.org,
	nathan.d.ciobanu@intel.com, jared_dominguez@dell.com,
	stable@vger.kernel.org, Lyude <cpaul@redhat.com>
Subject: [RESEND PATCH v2 2/2] drm/i915/mst: Reset MST after resume when necessary
Date: Tue, 23 Oct 2018 19:19:25 -0700	[thread overview]
Message-ID: <20181024021925.27026-3-juston.li@intel.com> (raw)
In-Reply-To: <20181024021925.27026-1-juston.li@intel.com>

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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Juston Li <juston.li@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: lyude@redhat.com, clinton.a.taylor@intel.com,
	nathan.d.ciobanu@intel.com, mario.limonciello@dell.com,
	jared_dominguez@dell.com, linux-kernel@vger.kernel.org,
	Lyude <cpaul@redhat.com>,
	stable@vger.kernel.org, Juston Li <juston.li@intel.com>
Subject: [RESEND PATCH v2 2/2] drm/i915/mst: Reset MST after resume when necessary
Date: Tue, 23 Oct 2018 19:19:25 -0700	[thread overview]
Message-ID: <20181024021925.27026-3-juston.li@intel.com> (raw)
In-Reply-To: <20181024021925.27026-1-juston.li@intel.com>

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


  parent reply	other threads:[~2018-10-24  2:19 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-24  2:19 [RESEND PATCH v2 0/2] Check MST topology change on resume Juston Li
2018-10-24  2:19 ` Juston Li
2018-10-24  2:19 ` [RESEND PATCH v2 1/2] drm/dp/mst: Reprobe EDID for MST ports " Juston Li
2018-10-24  2:19   ` Juston Li
2018-10-24 22:09   ` Lyude Paul
2018-10-24 22:45     ` Li, Juston
2018-11-09  0:43       ` Lyude Paul
2018-11-26 21:53         ` Li, Juston
2018-11-26 22:35           ` Lyude Paul
2018-10-24 23:02     ` Lyude Paul
2018-10-24 23:02       ` Lyude Paul
2019-06-14 21:56   ` Sasha Levin
2019-06-14 22:10     ` Lyude Paul
2019-06-15 22:38       ` Sasha Levin
2019-06-15 22:38         ` Sasha Levin
2019-06-14 21:56   ` Sasha Levin
2018-10-24  2:19 ` Juston Li [this message]
2018-10-24  2:19   ` [RESEND PATCH v2 2/2] drm/i915/mst: Reset MST after resume when necessary Juston Li
2018-10-24  2:48 ` ✗ Fi.CI.BAT: failure for Check MST topology change on resume Patchwork
2018-10-24  8:57 ` [Intel-gfx] [RESEND PATCH v2 0/2] " Daniel Vetter
2018-10-24  8:57   ` Daniel Vetter
2018-10-24 16:37   ` Li, Juston
2018-10-24 16:37     ` Li, Juston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181024021925.27026-3-juston.li@intel.com \
    --to=juston.li@intel.com \
    --cc=cpaul@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jared_dominguez@dell.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mario.limonciello@dell.com \
    --cc=nathan.d.ciobanu@intel.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.