From patchwork Thu Mar 5 18:22:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todd Previte X-Patchwork-Id: 5948611 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 ECCAA9F373 for ; Thu, 5 Mar 2015 18:22:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1859C20117 for ; Thu, 5 Mar 2015 18:22:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 290EF20114 for ; Thu, 5 Mar 2015 18:22:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 644896E3A2; Thu, 5 Mar 2015 10:22:30 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by gabe.freedesktop.org (Postfix) with ESMTP id DB7906E3A2 for ; Thu, 5 Mar 2015 10:22:28 -0800 (PST) Received: by pdjz10 with SMTP id z10so17271379pdj.11 for ; Thu, 05 Mar 2015 10:22:28 -0800 (PST) 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=ih8h8H+vetVNoIhy/ug/QnEeHZ3X/wgpFO0zWW0sNKU=; b=oFG9w0FiapH44VBMWh7fgNVL1EBXUZz5vCl6OPh0ADCIZifo5Pqe8QcJt3paYUw/em Y29RSzpi4zmOmQd7h2nTqXSa0ihv9FZwH52vmGZL1x/BRp2d+lgGhFlaHuD8gdbcD8dK wRzdLchRKI/THpsDNVZnzKWcOEjYe9iwIGIzySNkvBACqvTazkwUIlpyOXyaqpGxqLVK LNnOetMayChciNlx+A5lEMxNkknHGGu+9obJHzXah/gcXPHH2GoqokQegY+4XQ860eA7 HUq08HbfMRCBV/xCITyiyT9eDET2dzELs01/sCnf7SozZqKD/TRdkX37B0aDRg98zb5c e2Sw== X-Received: by 10.67.3.105 with SMTP id bv9mr17754933pad.149.1425579748719; Thu, 05 Mar 2015 10:22:28 -0800 (PST) Received: from localhost.localdomain (ip70-162-72-208.ph.ph.cox.net. [70.162.72.208]) by mx.google.com with ESMTPSA id oq4sm7517252pdb.73.2015.03.05.10.22.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Mar 2015 10:22:27 -0800 (PST) From: Todd Previte To: intel-gfx@lists.freedesktop.org Date: Thu, 5 Mar 2015 11:22:19 -0700 Message-Id: <1425579739-17007-1-git-send-email-tprevite@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424314837-32434-8-git-send-email-tprevite@gmail.com> References: <1424314837-32434-8-git-send-email-tprevite@gmail.com> Subject: [Intel-gfx] [PATCH] drm/i915: Update intel_dp_hpd_pulse() to check link status for non-MST operation 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 Update the hot plug function to handle the SST case. Instead of placing the SST case within the long/short pulse block, it is now handled after determining that MST mode is not in use. This way, the topology management layer can handle any MST-related operations while SST operations are still correctly handled afterwards. This patch also corrects the problem of SST mode only being handled in the case of a short (0.5ms - 1.0ms) HPD pulse. For compliance testing purposes both short and long pulses are used by the different tests, thus both cases need to be addressed for SST. This patch replaces [PATCH 10/10] drm/i915: Fix intel_dp_hot_plug() in the previous compliance testing patch sequence. Review feedback on that patch indicated that updating intel_dp_hot_plug() was not the correct place for the test handler. For the SST case, the main stream is disabled for long HPD pulses as this generally indicates either a connect/disconnect event or link failure. For a number of case in compliance testing, the source is required to disable the main link upon detection of a long HPD. V2: - N/A V3: - Place the SST mode link status check into the mst_fail case - Remove obsolete comment regarding SST mode operation - Removed an erroneous line of code that snuck in during rebasing V4: - Added a disable of the main stream (DP transport) for the long pulse case for SST to support compliance testing Signed-off-by: Todd PRevite --- drivers/gpu/drm/i915/intel_dp.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 080cc23..2460d14 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4618,16 +4618,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) if (intel_dp_check_mst_status(intel_dp) == -EINVAL) goto mst_fail; } - - if (!intel_dp->is_mst) { - /* - * we'll check the link status via the normal hot plug path later - - * but for short hpds we should check it now - */ - drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); - intel_dp_check_link_status(intel_dp); - drm_modeset_unlock(&dev->mode_config.connection_mutex); - } } ret = IRQ_HANDLED; @@ -4639,6 +4629,21 @@ mst_fail: DRM_DEBUG_KMS("MST device may have disappeared %d vs %d\n", intel_dp->is_mst, intel_dp->mst_mgr.mst_state); intel_dp->is_mst = false; drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); + } else { + /* SST mode - handle short/long pulses here */ + drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); + /* Clear compliance testing flags/data here to prevent + * false detection in userspace */ + intel_dp->compliance_test_data = 0; + intel_dp->compliance_testing_active = 0; + /* For a long pulse in SST mode, disable the main link */ + if (long_hpd) { + I915_WRITE(DP_TP_CTL(intel_dig_port->port), + ~DP_TP_CTL_ENABLE); + } + intel_dp_check_link_status(intel_dp); + drm_modeset_unlock(&dev->mode_config.connection_mutex); + ret = IRQ_HANDLED; } put_power: intel_display_power_put(dev_priv, power_domain);