From patchwork Tue Aug 9 10:51:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9270847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5ABA86082E for ; Tue, 9 Aug 2016 10:52:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C14127F80 for ; Tue, 9 Aug 2016 10:52:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E7342711E; Tue, 9 Aug 2016 10:52:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C852B2711E for ; Tue, 9 Aug 2016 10:52:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 112ED6E4D7; Tue, 9 Aug 2016 10:52:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3AB8B6E432 for ; Tue, 9 Aug 2016 10:52:25 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id o80so2320112wme.0 for ; Tue, 09 Aug 2016 03:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=puKOkMmJjmvd823EMhH+mby1edoF4gDP7CPutrRWWyo=; b=NbcUb1cviva9LcrZmqf7J7Wftqaqa6+Z2V85GqQY6LYRouO4y7l1ZalO9b+c3KOHaB gBcreRdrcxn51AOlanz1ocpWLlbxIwC24S7cbwrGcT0umi4YpAmnUSvzSESsfTcLjpnS TeyJmI5BuHHU4EWnNjQbhQJpuWUq3Xv62D9W9PcvhPgUwJ+v3xHXi1UEYeBTkE40U9+l YieO0ewbe67ZTIwmVbFHKL64r+65wYQivYRJ9unRJHgvR8Gs+oDD/LaDFBn56H+USJfF OzSipKNtyvR33QyIM6Y2bk358GpqlKYGRqEyXV4EYhE3UQ2qlr8k/8S/OAabvt/PS2Th 0DCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=puKOkMmJjmvd823EMhH+mby1edoF4gDP7CPutrRWWyo=; b=DyWORBgn3OFmgq4R9WsGtLepo2VxGHCNsGpphGhYg+93HL8NSOvsxKty3LgwIK9q1P nxhUFh44CLBPl5iotXQeoJ1QPc/HzAjo5mWG5ivYOj1AlwAsfIVWDjHGEdNeKPa7afDA 6rCeWDg4m9tQZtGrKBo2+0KVtCZXencP4CaNugMBoj2hgFVGGiGwmjEUeVok5mB4KLh7 uguDHAiB2hp/uV8vC+166/sZCBvxA52beBlaul/hHQ5mi8DzdJuoc/zJ6owB54E/0YqE S+3tBZEDdJqvpcVkm7QUuuvjHpxuc9eErkM4u+WweQskKPoxlF6whPy6e5HyRs9lOJ+3 srNQ== X-Gm-Message-State: AEkoousM1ABU8a+Pj3GnVvHre5BP10PPMTRTTimR/aHgJaaiARcErXW6FK19iibkfxm+cw== X-Received: by 10.194.136.196 with SMTP id qc4mr98845692wjb.136.1470739943799; Tue, 09 Aug 2016 03:52:23 -0700 (PDT) Received: from cizrna.lan ([109.72.12.53]) by smtp.gmail.com with ESMTPSA id q4sm37404825wjk.24.2016.08.09.03.52.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Aug 2016 03:52:23 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v1 3/5] drm/dp: add helpers for capture of frame CRCs Date: Tue, 9 Aug 2016 12:51:34 +0200 Message-Id: <1470739896-11088-4-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470739896-11088-1-git-send-email-tomeu.vizoso@collabora.com> References: <1470739896-11088-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , dri-devel@lists.freedesktop.org, Daniel Vetter , Emil Velikov X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/drm_dp_helper.c | 133 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 7 +++ 2 files changed, 140 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index eae5ef963cb7..bf88ae7deb9a 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -790,6 +790,90 @@ static void unlock_bus(struct i2c_adapter *i2c, unsigned int flags) mutex_unlock(&i2c_to_aux(i2c)->hw_mutex); } +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; + wait_queue_head_t *wq; + u8 crc_bytes[6]; + uint32_t crcs[3]; + u32 last; + int ret; + + if (WARN_ON(!aux->connector)) + return; + + crtc = aux->connector->state->crtc; + wq = drm_crtc_vblank_waitqueue(crtc); + while (crtc->crc.opened) { + ret = drm_crtc_vblank_get(crtc); + if (WARN(ret, "vblank not available on crtc %i, ret=%i\n", + crtc->index, ret)) + return; + + last = drm_crtc_vblank_count(crtc); + wait_event(*wq, last != drm_crtc_vblank_count(crtc)); + + drm_crtc_vblank_put(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; + } + + spin_lock_irq(&crtc->crc.lock); + 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); + spin_unlock_irq(&crtc->crc.lock); + if (!ret) + wake_up_interruptible(&crtc->crc.wq); + } +} + /** * drm_dp_aux_init() - minimally initialise an aux channel * @aux: DisplayPort AUX channel @@ -802,6 +886,7 @@ static void unlock_bus(struct i2c_adapter *i2c, unsigned int flags) 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; @@ -892,3 +977,51 @@ 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; + + 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 f66cc8501d71..c6ddc4edda61 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -712,6 +712,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 @@ -749,6 +751,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); /** @@ -820,4 +824,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_ */