From patchwork Fri Jul 1 22:22:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 939352 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p61Mb4bi027310 for ; Fri, 1 Jul 2011 22:37:24 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED7A89EE9B for ; Fri, 1 Jul 2011 15:26:43 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy5-pub.bluehost.com (oproxy5-pub.bluehost.com [67.222.38.55]) by gabe.freedesktop.org (Postfix) with SMTP id 493A99EE9B for ; Fri, 1 Jul 2011 15:23:05 -0700 (PDT) Received: (qmail 24661 invoked by uid 0); 1 Jul 2011 22:23:04 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy2.bluehost.com with SMTP; 1 Jul 2011 22:23:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=lYHFlFxFh63+1HLCAZcDRsIjuG5IfMYCQkUu0m6PgQzvzhMHTTP0I6i8hI64TzQCsNO1FhzOrujwa4gy49xPcL8qaFqMzsFf4y6iFm9eAF339zdohh3UDvv2nHwbo/OB; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Qcm76-00047w-Bl; Fri, 01 Jul 2011 16:23:04 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 1 Jul 2011 15:22:58 -0700 Message-Id: <1309558978-4704-9-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309558978-4704-1-git-send-email-jbarnes@virtuousgeek.org> References: <1309558978-4704-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 8/8] drm/i915/dp: clear receiver_configured when link training fails X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 01 Jul 2011 22:37:24 +0000 (UTC) When link training or detection fails, set the receiver_configured flag to false to reflect the current state. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_dp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ac6334d..e3dd40f 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1383,6 +1383,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp) if (cr_tries > 5) { DRM_ERROR("failed to train DP, aborting\n"); intel_dp_link_down(intel_dp); + intel_dp->receiver_configured = false; break; } @@ -1556,6 +1557,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) out_gone: DRM_DEBUG_DRIVER("sink gone, clearing crtc for DP\n"); intel_dp->base.base.crtc = NULL; + intel_dp->receiver_configured = false; } static enum drm_connector_status