From patchwork Fri Apr 10 16:12:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todd Previte X-Patchwork-Id: 6197901 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 967B49F2EC for ; Fri, 10 Apr 2015 16:13:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C61C92034F for ; Fri, 10 Apr 2015 16:13:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 84E10203DB for ; Fri, 10 Apr 2015 16:13:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE2C16E9BA; Fri, 10 Apr 2015 09:13:03 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by gabe.freedesktop.org (Postfix) with ESMTP id F1D296E9BA for ; Fri, 10 Apr 2015 09:13:02 -0700 (PDT) Received: by pddn5 with SMTP id n5so27052767pdd.2 for ; Fri, 10 Apr 2015 09:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FqpAhLyhB3ofahaRcvcW1ApYLhiJu3p30qc9DT+dY7Y=; b=H+W7G40WNoSgluugLTqR9IIVt5/SdM2Pl2i4xKpuOG7snrXm1SqufJqWjqEhbxoFTV vOBIsEvx6qb+2Tm3gNZEQ7WtN56GCMm9XVeKAGGwUICTYCtDmMSBMo7z5fS/21tw0PWf 5GkAOlqjsPSzbyj3g4deYL+oVfnXCbemE91pvi5JnHPoWbgVXbiDh2HEvNJUUNwclF+d xpD58/qkwejeS2+BLXn65OPrb53h1MnZUrfqnwTTSUHki8lZWFV0WaWqrKDyYDUtjPIT B0/FiF6pYrpnzxarHTQRf8ih9dXi8UU6ZeCPlS9wHbxy4WPyA5undJKjb8UKZdQLaFUf cWHg== X-Received: by 10.70.90.34 with SMTP id bt2mr3947823pdb.33.1428682382722; Fri, 10 Apr 2015 09:13:02 -0700 (PDT) Received: from localhost.localdomain (ip70-162-72-208.ph.ph.cox.net. [70.162.72.208]) by mx.google.com with ESMTPSA id dk3sm2682849pbb.91.2015.04.10.09.13.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Apr 2015 09:13:02 -0700 (PDT) From: Todd Previte To: intel-gfx@lists.freedesktop.org Date: Fri, 10 Apr 2015 09:12:43 -0700 Message-Id: <1428682372-21586-3-git-send-email-tprevite@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428682372-21586-1-git-send-email-tprevite@gmail.com> References: <1428682372-21586-1-git-send-email-tprevite@gmail.com> Subject: [Intel-gfx] [PATCH 02/11] drm/i915: Ignore disconnected Displayport connectors in check_link_status X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adds a check at the top to verify that the device is connected. This is necessary for DP compliance testing to ensure that test requests are captured and acknowledged. If a test request is present during a connected->disconnected transition, the test code will attempt to execute even though the device is disconnected, resulting in a faied test. This patch is actually both a bug fix and a component of compliance testing. Because HPD events are received both on connect and disconnect actions, it's vital that we don't try and train the link when we're transitioning from connected->disconnected. That results in errors and warning in the logs from failed AUX transactions and can trigger the WARN for the check of !base.crtc. By making the check at the beginning to see if the connection is truly active, those problems are avoided and testing / link training will only be attempted when there is a valid Displayport connection. V1: - Earlier review feedback recommended the original check_link_status patch be split into two. This is the first patch of that split. Signed-off-by: Todd Previte --- drivers/gpu/drm/i915/intel_dp.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ae0fb98..30cd433 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3895,21 +3895,13 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex)); - if (!intel_encoder->connectors_active) - return; - - if (WARN_ON(!intel_encoder->base.crtc)) - return; - - if (!to_intel_crtc(intel_encoder->base.crtc)->active) - return; - - /* Try to read receiver status if the link appears to be up */ - if (!intel_dp_get_link_status(intel_dp, link_status)) { + if (intel_dp->attached_connector->base.status != + connector_status_connected) { + DRM_DEBUG_KMS("Not connected\n"); return; } - /* Now read the DPCD to see if it's actually running */ + /* Attempt to read the DPCD */ if (!intel_dp_get_dpcd(intel_dp)) { return; }