From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932548AbcESOUN (ORCPT ); Thu, 19 May 2016 10:20:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36190 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932233AbcESOUJ (ORCPT ); Thu, 19 May 2016 10:20:09 -0400 From: Lyude To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Dave Airlie Cc: Lyude , stable@vger.kernel.org, Daniel Vetter , Jani Nikula , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] drm/i915/mst: Reset MST after resume when necessary Date: Thu, 19 May 2016 10:19:56 -0400 Message-Id: <1463667596-25236-2-git-send-email-cpaul@redhat.com> In-Reply-To: <1463667596-25236-1-git-send-email-cpaul@redhat.com> References: <1463667596-25236-1-git-send-email-cpaul@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 19 May 2016 14:20:08 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/gpu/drm/i915/intel_dp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index db6a0fd..5b62f7e 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -6063,6 +6063,7 @@ void intel_dp_mst_suspend(struct drm_device *dev) void intel_dp_mst_resume(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_dp_mst_topology_mgr *mgr; int i; for (i = 0; i < I915_MAX_PORTS; i++) { @@ -6075,8 +6076,14 @@ void intel_dp_mst_resume(struct drm_device *dev) if (!intel_dig_port->dp.can_mst) continue; - ret = drm_dp_mst_topology_mgr_resume(&intel_dig_port->dp.mst_mgr); - if (ret != 0) { + mgr = &intel_dig_port->dp.mst_mgr; + + ret = drm_dp_mst_topology_mgr_resume(mgr); + /* A full reset is required */ + if (ret == -EINVAL) { + drm_dp_mst_topology_mgr_set_mst(mgr, false); + intel_dp_probe_mst(&intel_dig_port->dp); + } else if (ret != 0) { intel_dp_check_mst_status(&intel_dig_port->dp); } } -- 2.5.5