From patchwork Fri Mar 3 13:39:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 94839 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp240107qgd; Fri, 3 Mar 2017 05:40:46 -0800 (PST) X-Received: by 10.84.193.101 with SMTP id e92mr4591020pld.4.1488548446419; Fri, 03 Mar 2017 05:40:46 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id q25si10664092pgd.195.2017.03.03.05.40.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 86DF16ED23; Fri, 3 Mar 2017 13:40:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id C510C6ED23; Fri, 3 Mar 2017 13:40:12 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id n11so3209576wma.0; Fri, 03 Mar 2017 05:40:12 -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=kNTaUFTeialK0rFNg0MQP6jHaJRtS+xWvB3SDvR1v+s=; b=Ph7qlygX2gdK73PTMkS03EjXBsMcWXV/cuv1mTr/qp1w2QILeJZNL763DWvqMQRa+A /8WHSndy73KNgkx3ogakGHiE5Lz/pEBJHUMZ1jRbGL64MCyimGSVXlG4hucClnlgBey1 MW7A0QhUDcktmdYWVFLoQyQVFXa+2KMjP9eQG3hMlZOoM+7nY41z0w/9z1MBjAkWxC/X euOM5RSuqdm3DMNGJCg08SXqWkY9/qOfKkPcSgAF6KqFw3YeV1vlafHRB44Dh87jVap4 X1LI7mRAkkzeACXc8UfpaUzEaJ74RUbv8AufRdyKNG/TXSBYoOmprpLzkq9NSojyWlrK 9jwQ== 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=kNTaUFTeialK0rFNg0MQP6jHaJRtS+xWvB3SDvR1v+s=; b=EocbTBPUGD25aR1hqwO+8O+Y0HxqDyWcDARvwxXzUYUsC8duabRTcbOrLB6Qpl6u+G o/SnHWJa4pnj8by9Vq6APUb/8QC7CSD8EM6daVUQWWCHI0rTcfy5SEB4DE64hiepKZWj 6AciHCaPDc0EjsirQLiuYw7JkQqUIJoYmGCh0IHrv/cXoD3gA/SkWPRT5v1C3uehP5S3 jgd39qak7/sBCxCwaCydoLgB5KXl6ROlz5F4PHUzIJlLY/s3ve5Dp74a82O3CZn8N8e4 N715u8y2h2KKPd5oswcbmGo0uTvVVEiCEUmRf1kXynTH3Wc7KKftNAvshJcRo9IA+Wyd pvyA== X-Gm-Message-State: AMke39lg5kc8XGHHl6lxEzjnEcZ9ht+Ai5bIQSIRd+WdJAJswxfNCwwgmul4xWRn14OcCQ== X-Received: by 10.28.11.205 with SMTP id 196mr2560581wml.31.1488548411494; Fri, 03 Mar 2017 05:40:11 -0800 (PST) Received: from cizrna.lan ([109.72.12.6]) by smtp.gmail.com with ESMTPSA id d42sm15247482wrd.7.2017.03.03.05.40.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:10 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v6 1/4] drm/dp: add crtc backpointer to drm_dp_aux Date: Fri, 3 Mar 2017 14:39:33 +0100 Message-Id: <20170303133936.14964-2-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170303133936.14964-1-tomeu.vizoso@collabora.com> References: <20170303133936.14964-1-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , Emil Velikov , dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org, Daniel Vetter 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" This backpointer allows DP helpers to access the crtc it's currently being used for. v6: Have the backpointer be to drm_crtc (Sean Paul) Signed-off-by: Tomeu Vizoso --- include/drm/drm_dp_helper.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index ba89295c8651..a710e39b5f83 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -789,6 +789,7 @@ struct drm_dp_aux_msg { * @name: user-visible name of this AUX channel and the I2C-over-AUX adapter * @ddc: I2C adapter that can be used for I2C-over-AUX communication * @dev: pointer to struct device that is the parent for this AUX channel + * @crtc: backpointer to the crtc that is currently using this AUX channel * @hw_mutex: internal mutex used for locking transfers * @transfer: transfers a message representing a single AUX transaction * @@ -825,6 +826,7 @@ struct drm_dp_aux { const char *name; struct i2c_adapter ddc; struct device *dev; + struct drm_crtc *crtc; struct mutex hw_mutex; ssize_t (*transfer)(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg); From patchwork Fri Mar 3 13:39:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 94840 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp240158qgd; Fri, 3 Mar 2017 05:40:56 -0800 (PST) X-Received: by 10.84.216.17 with SMTP id m17mr4509039pli.158.1488548456021; Fri, 03 Mar 2017 05:40:56 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id l4si10673727plk.280.2017.03.03.05.40.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 19BF26ED29; Fri, 3 Mar 2017 13:40:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00BFF6ED26; Fri, 3 Mar 2017 13:40:23 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m70so3193301wma.1; Fri, 03 Mar 2017 05:40:23 -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=+xoJH7bSUkw7miI2QmCetOggQvvqUHyDXDMe7b7m/D0=; b=tH2wnE2W210IVnue3DgMWGzXGuvOIB0u5KGbjg9edYp9syZvPcXb0vJSXjSW6Mivbd MP/qGlSQVoDQ6V51zPOpsL35JkQ5MBERm1IUSBHAgW4/6cCKqoibBcd6whqNz/s2WqfL 3UmUVoCM676+0AMPo2leushzwOOWFmxgzWbs8+ui3Hq73ezVuJNYmzaOSObDPONwT1yl N/ok1JQSC1wTBP9Fyx5QCLq8/fKvrUp/vc4A5eUcGMJYuHZ6xAsXnNhUtwRU38YgAvWB P/bAspC5CTYTKyFZKZ9ChkvWZcrznPs6005e0GuxkXS5ZSjIbGn7NA7dHbvkfJFWeGvv HMkA== 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=+xoJH7bSUkw7miI2QmCetOggQvvqUHyDXDMe7b7m/D0=; b=EdsJsHDH0TvbhjKTk9t+U3tjfLU1QTtkmgU8ZLqKXzswKMdTpuGGytLn2NhxZe+gKh +zefs79ulPIkI4vfNWK/eBtOljk+KDtyU7Q9wgfARhw4ochxmZDny2Pb95/o163MiwGN CCr6yx+TDvzkIielzEeP/D5VQvs6UA+zzzbetXVYwhOkLeSkei9Phx1cT8bPk0l9foZb o50gCEwZwJ02KtZBRxCCMeTYDr2IF6bs4uoRa2PEHX//ZaEnunwPiBQyNK7ajfb6khDX M535rBVUvZFhQahh2T3KAxjD1PRzR1wlP9udBY8LU+sgnJv6WH6wNubVkEvorwLrBtzp 37nA== X-Gm-Message-State: AMke39lRz4LneLFwpRVBb4AQ/719MmVAw2GwtE37/CcsFDVLX8GLMZ84kYlLKryqZ9WK7g== X-Received: by 10.28.182.10 with SMTP id g10mr3166437wmf.123.1488548422540; Fri, 03 Mar 2017 05:40:22 -0800 (PST) Received: from cizrna.lan ([109.72.12.6]) by smtp.gmail.com with ESMTPSA id d42sm15247482wrd.7.2017.03.03.05.40.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:12 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v6 2/4] drm/dp: add helpers for capture of frame CRCs Date: Fri, 3 Mar 2017 14:39:34 +0100 Message-Id: <20170303133936.14964-3-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170303133936.14964-1-tomeu.vizoso@collabora.com> References: <20170303133936.14964-1-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , Emil Velikov , dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org, Daniel Vetter 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" 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. v4: Style fixes (Sean Paul) Reworked retry of CRC reads (Sean Paul) Flush worker after stopping CRC generationa (Sean Paul) v5: Move back to make the retry explicitly once v6: Set and use the drm_crtc backpointer (Sean Paul) Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/drm_dp_helper.c | 126 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_dp_helper.h | 7 +++ 2 files changed, 133 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 68908c1d5ca1..c40cfe2e63ab 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -981,6 +981,78 @@ 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->crtc)) + return; + + crtc = aux->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 == -EAGAIN) { + DRM_DEBUG_KMS("Get CRC failed after retrying: %d\n", + ret); + continue; + } else if (ret) { + DRM_DEBUG_KMS("Failed to get a CRC: %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; + drm_crtc_add_crc_entry(crtc, false, 0, crcs); + } +} + /** * drm_dp_aux_init() - minimally initialise an aux channel * @aux: DisplayPort AUX channel @@ -993,6 +1065,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 +1154,56 @@ 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, struct drm_crtc *crtc) +{ + 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; + aux->crtc = crtc; + 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; + + flush_work(&aux->crc_work); + aux->crtc = NULL; + + 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 a710e39b5f83..c0bd0d7651a9 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -791,6 +791,8 @@ struct drm_dp_aux_msg { * @dev: pointer to struct device that is the parent for this AUX channel * @crtc: backpointer to the crtc that is currently using 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 @@ -828,6 +830,8 @@ struct drm_dp_aux { struct device *dev; struct drm_crtc *crtc; 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); /** @@ -906,4 +910,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, struct drm_crtc *crtc); +int drm_dp_stop_crc(struct drm_dp_aux *aux); + #endif /* _DRM_DP_HELPER_H_ */ From patchwork Fri Mar 3 13:39:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 94841 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp240166qgd; Fri, 3 Mar 2017 05:40:58 -0800 (PST) X-Received: by 10.99.116.10 with SMTP id p10mr3511137pgc.74.1488548458528; Fri, 03 Mar 2017 05:40:58 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id y67si10685342pfa.97.2017.03.03.05.40.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4A5046ED2A; Fri, 3 Mar 2017 13:40:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id C46FC6ED1F; Fri, 3 Mar 2017 13:40:25 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id g10so13344035wrg.0; Fri, 03 Mar 2017 05:40:25 -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=bb4Qlu5mRVuM6e/Ykhg4y+ekxP0dkjLOJEiEY2wpay4=; b=kRV90LmNSMVcbXuj2TzYktDw/BUNTnl6BPw8SW7xAFqZJ9FB5zw1rw/BadHFywOm0m bZvfhfrZKzAZ4Q6JWygWamH+P1b2hlvzLEWEx3i2C25uZr1UqCjcgZC9irla8kaoXUe9 GHByEzyu2KAykqaCmrIMBUx9tAC+9+I4PLRBO7+kU7dnm1jQksU44inBj99MtDH+Hpdl OVzQK7uTKPechwJoqV14wBDllRthuxuLWwZ8fL9IG7P4kZXi+ab5lPkwyFRxUm05C83O B5My6fJG1zX0BEWzTG1HVK4BNAZfFhwV+JBSugBWiGAM7weIX4fGbwGSQP69S+2GclMj djIg== 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=bb4Qlu5mRVuM6e/Ykhg4y+ekxP0dkjLOJEiEY2wpay4=; b=MfUXiSAGshlizDiihUmSbD/2UJVJ46RwvYaAcl0A18pJsEmxdsD6WRzOaM8br46Qs6 Bq/T95qzGOG+xCU4os4Fk1Ke7su7thqbjG7h3to5vzJ1AC3d7lE6xLD2o+bfmhA46mJj JDJ3zRJt9pj6LkkCxjnnhMVgEO5W0OBW1zQ7sEG+en8YdGji6Ep8Uw13p81STt+dZ1LC yXWrPQcKwf4Q3H+w3/bkEASCL7uH3M86rk0YGspKa/x34GvH3RpkEYBE4oXLKMrVMlQK bh/OzG/TzQREjaLAJdRFH6+d/MgRQczpkZLmq27NlubseL/3gcM5vF7XoGzbfJhH3Aw1 3/vg== X-Gm-Message-State: AMke39nuNTCqNbviQZjOTiwscA2DvMyTODC9STZFSWrfGagdvnnh1RMOR8GU8k8LDAeAJg== X-Received: by 10.223.155.211 with SMTP id e19mr2592765wrc.74.1488548424492; Fri, 03 Mar 2017 05:40:24 -0800 (PST) Received: from cizrna.lan ([109.72.12.6]) by smtp.gmail.com with ESMTPSA id d42sm15247482wrd.7.2017.03.03.05.40.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:23 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v6 3/4] drm/bridge: analogix_dp: add helpers for capture of frame CRCs Date: Fri, 3 Mar 2017 14:39:35 +0100 Message-Id: <20170303133936.14964-4-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170303133936.14964-1-tomeu.vizoso@collabora.com> References: <20170303133936.14964-1-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , Emil Velikov , dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org, Daniel Vetter 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" Add two simple functions that just take the drm_dp_aux from our struct and calls the corresponding DP helpers with it. v6: Pass to the DP helper the drm_crtc of the current connector (Sean Paul) Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 22 ++++++++++++++++++++++ include/drm/bridge/analogix_dp.h | 3 +++ 2 files changed, 25 insertions(+) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index e7cd1056ff2d..c26997afd3cf 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1488,6 +1488,28 @@ int analogix_dp_resume(struct device *dev) EXPORT_SYMBOL_GPL(analogix_dp_resume); #endif +int analogix_dp_start_crc(struct drm_connector *connector) +{ + struct analogix_dp_device *dp = to_dp(connector); + + if (!connector->state->crtc) { + DRM_ERROR("Connector %s doesn't currently have a CRTC.\n", + connector->name); + return -EINVAL; + } + + return drm_dp_start_crc(&dp->aux, connector->state->crtc); +} +EXPORT_SYMBOL_GPL(analogix_dp_start_crc); + +int analogix_dp_stop_crc(struct drm_connector *connector) +{ + struct analogix_dp_device *dp = to_dp(connector); + + return drm_dp_stop_crc(&dp->aux); +} +EXPORT_SYMBOL_GPL(analogix_dp_stop_crc); + MODULE_AUTHOR("Jingoo Han "); MODULE_DESCRIPTION("Analogix DP Core Driver"); MODULE_LICENSE("GPL v2"); diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h index f6f0c062205c..c99d6eaef1ac 100644 --- a/include/drm/bridge/analogix_dp.h +++ b/include/drm/bridge/analogix_dp.h @@ -49,4 +49,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, struct analogix_dp_plat_data *plat_data); void analogix_dp_unbind(struct device *dev, struct device *master, void *data); +int analogix_dp_start_crc(struct drm_connector *connector); +int analogix_dp_stop_crc(struct drm_connector *connector); + #endif /* _ANALOGIX_DP_H_ */ From patchwork Fri Mar 3 13:39:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 94837 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp239993qgd; Fri, 3 Mar 2017 05:40:31 -0800 (PST) X-Received: by 10.99.110.138 with SMTP id j132mr3403076pgc.217.1488548431375; Fri, 03 Mar 2017 05:40:31 -0800 (PST) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id g5si10658368pgp.49.2017.03.03.05.40.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 941466ED1F; Fri, 3 Mar 2017 13:40:30 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3238C6ED30; Fri, 3 Mar 2017 13:40:28 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id z63so992257wmg.2; Fri, 03 Mar 2017 05:40:28 -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=xLWAAxoQcFz2XmdPFpe/LGyrqsEiyQHSxuOv8CpmPAE=; b=L2axRrYWw/5N6rprBYwAznRSY+LgC4JW8bDlkB4RkFeyBwfBVeDpbYRzOjltuLFWjO zbRbZ4SDrqTKkSX4kYIWanofkgbKrjfkwQj9Y/0PiB5Eqynn0vQjIdhSfL/JEIYsB6aS ylaEEKTzPLsj5xGGxrRF9g18f0ydckg1Rppfe/LV48YviswqTqrfjER9IpvkUpemYfAa ssF7WIMfDD0pznh/oGsP4fuDxsSx1Gobhjv3ZB26Vfk73ycZSlsFi9E9PEUoJEjOuEWD 057PHfGQ55eFWSBRFElwI0VMazNGqs2ZfWrL8QVkvqsO6cxb9oiEYI4IOOj8HcSz4mRG dbxA== 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=xLWAAxoQcFz2XmdPFpe/LGyrqsEiyQHSxuOv8CpmPAE=; b=mWehkjIw+r6UbQovFIEQmKLHIKAlgreLnViLloupwIUXBZip7ck9KYoCS5QVEKH839 MCHYnKr/F7A72xSWdhDvigqkaAWLuolBBtCuqjCG4nYZ2261M+5Hx0y9RT5WJHdU9XNv R6urk+yeTEfKXxfJB6+Jjz4uyQWaMK85pLWLaCfM6TmE9Ceoj8MJjGCMU7hVp1JynT1J yfhCDSAfm06stFriQu2gDrMZDd/dDZFApsYB7lVQhokVvt5K19n6JVYv0KcWp63YHdTy elQHJ20rVBSNlJjpIaXcrkuZfwa5IffnuBehgOyzdqj3EALh19yGSTo1wCTCbvW6dgZn MUiw== X-Gm-Message-State: AMke39nna6Kn55oC+29ac/SUJbW41kBesGYDCOOJmgBBGvYNdjJleuSyf5ePkmP41KSbKg== X-Received: by 10.28.111.78 with SMTP id k75mr3225833wmc.71.1488548426883; Fri, 03 Mar 2017 05:40:26 -0800 (PST) Received: from cizrna.lan ([109.72.12.6]) by smtp.gmail.com with ESMTPSA id d42sm15247482wrd.7.2017.03.03.05.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 05:40:25 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v6 4/4] drm/rockchip: Implement CRC debugfs API Date: Fri, 3 Mar 2017 14:39:36 +0100 Message-Id: <20170303133936.14964-5-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170303133936.14964-1-tomeu.vizoso@collabora.com> References: <20170303133936.14964-1-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , Emil Velikov , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, intel-gfx-trybot@lists.freedesktop.org, Daniel Vetter 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" Implement the .set_crc_source() callback and call the DP helpers accordingly to start and stop CRC capture. This is only done if this CRTC is currently using the eDP connector. v3: Remove superfluous check on rockchip_crtc_state->output_type v6: Remove superfluous variable Signed-off-by: Tomeu Vizoso Acked-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 94d7b7327ff7..17ab16c4b922 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -1111,6 +1112,45 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, kfree(s); } +static struct drm_connector *vop_get_edp_connector(struct vop *vop) +{ + struct drm_crtc *crtc = &vop->crtc; + struct drm_connector *connector; + + mutex_lock(&crtc->dev->mode_config.mutex); + drm_for_each_connector(connector, crtc->dev) + if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { + mutex_unlock(&crtc->dev->mode_config.mutex); + return connector; + } + mutex_unlock(&crtc->dev->mode_config.mutex); + + return NULL; +} + +static int vop_crtc_set_crc_source(struct drm_crtc *crtc, + const char *source_name, size_t *values_cnt) +{ + struct vop *vop = to_vop(crtc); + struct drm_connector *connector; + int ret; + + connector = vop_get_edp_connector(vop); + if (!connector) + return -EINVAL; + + *values_cnt = 3; + + if (source_name && strcmp(source_name, "auto") == 0) + ret = analogix_dp_start_crc(connector); + else if (!source_name) + ret = analogix_dp_stop_crc(connector); + else + ret = -EINVAL; + + return ret; +} + static const struct drm_crtc_funcs vop_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, @@ -1120,6 +1160,7 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { .atomic_destroy_state = vop_crtc_destroy_state, .enable_vblank = vop_crtc_enable_vblank, .disable_vblank = vop_crtc_disable_vblank, + .set_crc_source = vop_crtc_set_crc_source, }; static void vop_fb_unref_worker(struct drm_flip_work *work, void *val)