From patchwork Wed Dec 10 23:53:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todd Previte X-Patchwork-Id: 5473361 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BB9AF9F443 for ; Wed, 10 Dec 2014 23:54:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E180B2018E for ; Wed, 10 Dec 2014 23:54:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DB289201C8 for ; Wed, 10 Dec 2014 23:54:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A9206E719; Wed, 10 Dec 2014 15:54:17 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A6716E71E for ; Wed, 10 Dec 2014 15:54:15 -0800 (PST) Received: by mail-pa0-f49.google.com with SMTP id eu11so3786730pac.36 for ; Wed, 10 Dec 2014 15:54:15 -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=h992u36HguL1E0VFet8CAuDh/LhKtiqGj+5KB7HVgp0=; b=Km2D02Zxw3Z0+3APHnwxWVpVl1o/dVzSOAXKvXo95lvZkJSVG0QfPXK7jt9uh0rwM2 GQz+HQuSUlmFZfO6b3nLw68tqfBAYBvSnnoDUBXfm5zMb+bDs7GHV/Y1g0xW9o3jftAv K4wn453aixy4EmYm86CQoaxJ4XVNPajY5QqJZwjpzWwFy7y01hPE/DEk9MAcR5CfGCv7 PF6E5NrTOnw0GaBKlM8ahfms3Z3aEHmqbVS580ZVZj2agG8rWUNrLAKhVY4nUqh+RKXj KuMVZ/k6Xg6HBXU56IxOJqZ6oXd1a20pIvVU2sZGgSFlXYIAkyX1aBKEMt++wdnhANXy 6Lzw== X-Received: by 10.70.127.173 with SMTP id nh13mr4237641pdb.92.1418255655448; Wed, 10 Dec 2014 15:54:15 -0800 (PST) Received: from localhost.localdomain (ip68-3-234-27.ph.ph.cox.net. [68.3.234.27]) by mx.google.com with ESMTPSA id gy10sm5164958pbd.67.2014.12.10.15.54.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Dec 2014 15:54:14 -0800 (PST) From: Todd Previte To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Dec 2014 16:53:11 -0700 Message-Id: <1418255597-4716-12-git-send-email-tprevite@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418255597-4716-1-git-send-email-tprevite@gmail.com> References: <1418255597-4716-1-git-send-email-tprevite@gmail.com> Subject: [Intel-gfx] [PATCH 11/17] drm/i915: Update the EDID automated compliance test function 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 Updates the EDID compliance test function to perform the EDID read as required by the tests. This read needs to take place in the kernel for reasons of speed and efficiency. The results of the EDID read are handed off to userspace so that the remainder of the test can be conducted there. V2: - Addressed mailing list feedback - Removed excess debug messages - Removed extraneous comments - Fixed formatting issues (line length > 80) - Updated the debug message in compute_edid_checksum to output hex values instead of decimal Signed-off-by: Todd Previte --- drivers/gpu/drm/i915/intel_dp.c | 72 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index b6f5a72..2a13124 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -40,6 +40,13 @@ #define DP_LINK_CHECK_TIMEOUT (10 * 1000) +/* Compliance test status bits */ +#define INTEL_DP_EDID_OK (0<<0) +#define INTEL_DP_EDID_CORRUPT (1<<0) +#define INTEL_DP_RESOLUTION_PREFERRED (1<<2) +#define INTEL_DP_RESOLUTION_STANDARD (1<<3) +#define INTEL_DP_RESOLUTION_FAILSAFE (1<<4) + struct dp_link_dpll { int link_bw; struct dpll dpll; @@ -3761,9 +3768,72 @@ static uint8_t intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) return test_result; } +static bool intel_dp_compute_edid_checksum(uint8_t *edid_data, + uint8_t *edid_checksum) +{ + uint32_t byte_total = 0; + uint8_t i = 0; + bool edid_ok = true; + + /* Don't include last byte (the checksum) in the computation */ + for (i = 0; i < EDID_LENGTH - 2; i++) + byte_total += edid_data[i]; + + *edid_checksum = 256 - (byte_total % 256); + + if (*edid_checksum != edid_data[EDID_LENGTH - 1]) { + DRM_DEBUG_KMS("Invalid EDID checksum %02x, should be %02x\n", + edid_data[EDID_LENGTH - 40 - 1], *edid_checksum); + edid_ok = false; + } + + return edid_ok; +} + static uint8_t intel_dp_autotest_edid(struct intel_dp *intel_dp) { - uint8_t test_result = DP_TEST_NAK; + struct drm_connector *connector = &intel_dp->attached_connector->base; + struct i2c_adapter *adapter = &intel_dp->aux.ddc; + struct edid *edid_read = NULL; + uint8_t *edid_data = NULL; + uint8_t test_result = DP_TEST_NAK, checksum = 0; + uint32_t ret = 0; + + intel_dp->aux.i2c_nack_count = 0; + intel_dp->aux.i2c_defer_count = 0; + + edid_read = drm_get_edid(connector, adapter); + + if (edid_read == NULL) { + /* Check for NACKs/DEFERs, use failsafe if detected + (DP CTS 1.2 Core Rev 1.1, 4.2.2.4, 4.2.2.5) */ + if (intel_dp->aux.i2c_nack_count > 0 || + intel_dp->aux.i2c_defer_count > 0) + DRM_DEBUG_KMS("EDID read had %d NACKs, %d DEFERs\n", + intel_dp->aux.i2c_nack_count, + intel_dp->aux.i2c_defer_count); + intel_dp->compliance_test_data = INTEL_DP_EDID_CORRUPT | + INTEL_DP_RESOLUTION_FAILSAFE; + } else { + edid_data = (uint8_t *) edid_read; + + if (intel_dp_compute_edid_checksum(edid_data, &checksum)) { + ret = drm_dp_dpcd_write(&intel_dp->aux, + DP_TEST_EDID_CHECKSUM, + &edid_read->checksum, 1); + test_result = DP_TEST_ACK | + DP_TEST_EDID_CHECKSUM_WRITE; + intel_dp->compliance_test_data = + INTEL_DP_EDID_OK | + INTEL_DP_RESOLUTION_PREFERRED; + } else { + /* Invalid checksum - EDID corruption detection */ + intel_dp->compliance_test_data = + INTEL_DP_EDID_CORRUPT | + INTEL_DP_RESOLUTION_FAILSAFE; + } + } + return test_result; }