From patchwork Fri Jan 6 14:30:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 90178 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp9472033qgi; Fri, 6 Jan 2017 06:31:19 -0800 (PST) X-Received: by 10.99.54.12 with SMTP id d12mr41168441pga.107.1483713079318; Fri, 06 Jan 2017 06:31:19 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t125si2942362pgb.150.2017.01.06.06.31.19; Fri, 06 Jan 2017 06:31:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756880AbdAFObI (ORCPT + 25 others); Fri, 6 Jan 2017 09:31:08 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33148 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752322AbdAFObA (ORCPT ); Fri, 6 Jan 2017 09:31:00 -0500 Received: by mail-wm0-f67.google.com with SMTP id u144so5408284wmu.0 for ; Fri, 06 Jan 2017 06:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hLf3he1Df64n/wTFlspp9aB02bwraDNnVBScpNsICGI=; b=sczyQOYH1DXRQu0jwcU2QG9GLuNccFot2sQJfrWKOB8kIvaoQB+7h9JnAJiNZNUitQ chdBQMRkjXRU5K5+dyIIHFAeUYPApsY+zUyzF9V1AgdTQWbI2d70+zu1VlChNbLff5b4 cht6ec7uPnQsyfULYmx2XlyOctyRBV1ztMeR3jdK2r8lwDvOh9/1qZnWjoWBLlblXBuW BuP06x/XEiUMR88Fk+dkW/mVEUKI2w7Rp2gjTmrmVQFr4KiiBPPUeWAJQ/yXwv3QZHrQ 8FCJzUU8gc7g2QSZnymOe46J1L70rlbZrJvMWWEh9NlJPuzBvuczHtLXO3YjxL095mKt cTBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=hLf3he1Df64n/wTFlspp9aB02bwraDNnVBScpNsICGI=; b=E98DnHHoXb0T8azO8hWdNhDbDFcerqiuGZWrUFNXXAehIXl18GOl4OL/zdiTokFyEo C3B6sdsopjQq17rz+g8qGmKey4dS3L55/6iAXsiKkPrsI8p2pqJdrC6bAU+vQWkbAdb4 OcK4lJuGSATLF+9XBatxBV/DtetvpC3yuREzDTRKdnBPSiXHskZTpJupjWp7nj9O+FFj G/z+v/axGIYbcO0zLc5aUgjSJRxuYWt6bYatL2PKX2ubXLZYKbJ/1cgrlmudb7pBUlOB h2COQH2WIxlUYEj+1bwyxJ1BadltD1MeHAknRQPWTQqBPLJY1RmFjZIFZNQOibU+QL/8 8Rnw== X-Gm-Message-State: AIkVDXI5im6Oc1ia+zRXSiln1JDkc7JGae836kR5bi4oaRivh457D97xKHH2Xvj67AM1Eg== X-Received: by 10.28.130.66 with SMTP id e63mr3663939wmd.39.1483713058451; Fri, 06 Jan 2017 06:30:58 -0800 (PST) Received: from cizrna.lan ([109.72.12.216]) by smtp.gmail.com with ESMTPSA id u78sm3644493wma.11.2017.01.06.06.30.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Jan 2017 06:30:57 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Thierry Reding , intel-gfx-trybot@lists.freedesktop.org, Emil Velikov , Daniel Vetter , Benjamin Gaignard , Tomeu Vizoso , Jani Nikula , dri-devel@lists.freedesktop.org, David Airlie , Sean Paul Subject: [PATCH v3 3/5] drm/dp: add helpers for capture of frame CRCs Date: Fri, 6 Jan 2017 15:30:27 +0100 Message-Id: <20170106143029.11553-4-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170106143029.11553-1-tomeu.vizoso@collabora.com> References: <20170106143029.11553-1-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adds helpers for starting and stopping capture of frame CRCs through the DPCD. When capture is on, a worker waits for vblanks and retrieves the frame CRC to put it in the queue on the CRTC that is using the eDP connector, so it's passed to userspace. v2: Reuse drm_crtc_wait_one_vblank Update locking, as drm_crtc_add_crc_entry now takes the lock v3: Don't call wake_up_interruptible directly, that's now done in drm_crtc_add_crc_entry. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/drm_dp_helper.c | 118 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 7 +++ 2 files changed, 125 insertions(+) -- 2.9.3 diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 3e6fe82c6d64..e531f1317268 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -981,6 +981,74 @@ static const struct i2c_lock_operations drm_dp_i2c_lock_ops = { .unlock_bus = unlock_bus, }; +static int drm_dp_aux_get_crc(struct drm_dp_aux *aux, u8 *crc) +{ + u8 buf, count; + int ret; + + ret = drm_dp_dpcd_readb(aux, DP_TEST_SINK, &buf); + if (ret < 0) + return ret; + + WARN_ON(!(buf & DP_TEST_SINK_START)); + + ret = drm_dp_dpcd_readb(aux, DP_TEST_SINK_MISC, &buf); + if (ret < 0) + return ret; + + count = buf & DP_TEST_COUNT_MASK; + if (count == aux->crc_count) + return -EAGAIN; /* No CRC yet */ + + aux->crc_count = count; + + /* At DP_TEST_CRC_R_CR, there's 6 bytes containing CRC data, 2 bytes + * per component (RGB or CrYCb). + */ + ret = drm_dp_dpcd_read(aux, DP_TEST_CRC_R_CR, crc, 6); + if (ret < 0) + return ret; + + return 0; +} + +static void drm_dp_aux_crc_work(struct work_struct *work) +{ + struct drm_dp_aux *aux = container_of(work, struct drm_dp_aux, + crc_work); + struct drm_crtc *crtc; + u8 crc_bytes[6]; + uint32_t crcs[3]; + int ret; + + if (WARN_ON(!aux->connector)) + return; + + crtc = aux->connector->state->crtc; + while (crtc->crc.opened) { + drm_crtc_wait_one_vblank(crtc); + if (!crtc->crc.opened) + break; + + ret = drm_dp_aux_get_crc(aux, crc_bytes); + if (ret == -EAGAIN) { + usleep_range(1000, 2000); + ret = drm_dp_aux_get_crc(aux, crc_bytes); + } + + if (ret) { + DRM_DEBUG_KMS("Failed to get a CRC even after retrying: %d\n", + ret); + continue; + } + + crcs[0] = crc_bytes[0] | crc_bytes[1] << 8; + crcs[1] = crc_bytes[2] | crc_bytes[3] << 8; + crcs[2] = crc_bytes[4] | crc_bytes[5] << 8; + ret = drm_crtc_add_crc_entry(crtc, false, 0, crcs); + } +} + /** * drm_dp_aux_init() - minimally initialise an aux channel * @aux: DisplayPort AUX channel @@ -993,6 +1061,7 @@ static const struct i2c_lock_operations drm_dp_i2c_lock_ops = { void drm_dp_aux_init(struct drm_dp_aux *aux) { mutex_init(&aux->hw_mutex); + INIT_WORK(&aux->crc_work, drm_dp_aux_crc_work); aux->ddc.algo = &drm_dp_i2c_algo; aux->ddc.algo_data = aux; @@ -1081,3 +1150,52 @@ int drm_dp_psr_setup_time(const u8 psr_cap[EDP_PSR_RECEIVER_CAP_SIZE]) EXPORT_SYMBOL(drm_dp_psr_setup_time); #undef PSR_SETUP_TIME + +/** + * drm_dp_start_crc() - start capture of frame CRCs + * @aux: DisplayPort AUX channel + * + * Returns 0 on success or a negative error code on failure. + */ +int drm_dp_start_crc(struct drm_dp_aux *aux) +{ + u8 buf; + int ret; + + ret = drm_dp_dpcd_readb(aux, DP_TEST_SINK, &buf); + if (ret < 0) + return ret; + + ret = drm_dp_dpcd_writeb(aux, DP_TEST_SINK, buf | DP_TEST_SINK_START); + if (ret < 0) + return ret; + + aux->crc_count = 0; + schedule_work(&aux->crc_work); + + return 0; +} +EXPORT_SYMBOL(drm_dp_start_crc); + +/** + * drm_dp_stop_crc() - stop capture of frame CRCs + * @aux: DisplayPort AUX channel + * + * Returns 0 on success or a negative error code on failure. + */ +int drm_dp_stop_crc(struct drm_dp_aux *aux) +{ + u8 buf; + int ret; + + ret = drm_dp_dpcd_readb(aux, DP_TEST_SINK, &buf); + if (ret < 0) + return ret; + + ret = drm_dp_dpcd_writeb(aux, DP_TEST_SINK, buf & ~DP_TEST_SINK_START); + if (ret < 0) + return ret; + + return 0; +} +EXPORT_SYMBOL(drm_dp_stop_crc); diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 4fa77b434594..276e1ecd947b 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -723,6 +723,8 @@ struct drm_dp_aux_msg { * @dev: pointer to struct device that is the parent for this AUX channel * @connector: backpointer to connector that uses this AUX channel * @hw_mutex: internal mutex used for locking transfers + * @crc_work: worker that captures CRCs for each frame + * @crc_count: counter of captured frame CRCs * @transfer: transfers a message representing a single AUX transaction * * The .dev field should be set to a pointer to the device that implements @@ -760,6 +762,8 @@ struct drm_dp_aux { struct device *dev; struct drm_connector *connector; struct mutex hw_mutex; + struct work_struct crc_work; + u8 crc_count; ssize_t (*transfer)(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg); /** @@ -838,4 +842,7 @@ void drm_dp_aux_init(struct drm_dp_aux *aux); int drm_dp_aux_register(struct drm_dp_aux *aux); void drm_dp_aux_unregister(struct drm_dp_aux *aux); +int drm_dp_start_crc(struct drm_dp_aux *aux); +int drm_dp_stop_crc(struct drm_dp_aux *aux); + #endif /* _DRM_DP_HELPER_H_ */