From patchwork Thu Jan 12 08:58:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9512401 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 A9DF560476 for ; Thu, 12 Jan 2017 08:59:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D49D28631 for ; Thu, 12 Jan 2017 08:59:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 903B228681; Thu, 12 Jan 2017 08:59:43 +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=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5449D28631 for ; Thu, 12 Jan 2017 08:59:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cRbEU-0004AC-ID; Thu, 12 Jan 2017 08:59:42 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cRbEM-0003og-Vb; Thu, 12 Jan 2017 08:59:37 +0000 Received: by mail-wm0-x241.google.com with SMTP id r126so2184537wmr.3; Thu, 12 Jan 2017 00:59:14 -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=yhoD9qmlzBaFpG6LQNHSGOdK2uuh0xjEujewWpzwFOs=; b=MH+mrneAXUfKEpUU0eYlgHozPQDb6NAzip0Xz0/RqX1+Ce+8zbXeo4R4gfsW9T/Qrd z+UpQMI97Bpq088rtZVoRXe3wsbU7QGSKZikRscW7fPp9e35zrI51qutxHXATWLOUPCm 0FJ3sWkMYRpd43AHTWcQSUvw5SzT7XwGyZoPLh95fbtgjBicmyMeAkc8UUQebQD4ZUwE 2K8SgWA7jRJ9NoMlO1+C2Mgyuqq8jc//923WllcXwKiaAXTKaTzbpdnlPeCI/U/6OzjW OJ8DI07CqK141NV/4MrxApp0bWlgk0da3d/4I4dxtuG+hDpURGtIUO5QKy25Cn5yYy+d 20bA== 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=yhoD9qmlzBaFpG6LQNHSGOdK2uuh0xjEujewWpzwFOs=; b=dQzzjlE8XeYIAUXtpkpcQyrHV4Mn3OdtDO0g06nJsQdcolpHkQxJBZvuepEZNjiq9e BX20/TvF1Ol4guOjFOZeu7za8Jdq1hlyCxHwvbAk6wmpeDFLigx+ZMmbSP1+gpIcvnE2 6wgZH4nfWXVOhvkJ88UZntj3PYbugfET7KRgaDWgV1VDZ2iWNiJwtV+wzjt5FytCrhhZ pp6nNdu4HAMEl6TuGojtXzeehI+m5vI0lqgd/d88yh7rQxOW5nHjx2ufLX9Tp8nXE890 NXdiocTodRXRFBMhHydkOM+FHsAXZ8Xm6LcQ4EAPAVUTaRc8tnBkNvCal+JpwWWnHOvM IEYw== X-Gm-Message-State: AIkVDXKp/xxgXID4QX14KnCzrN1sNpv8xyStoRrnL3kiLIfw1ahcGZdyZQp8i/TylW/Mtg== X-Received: by 10.28.91.143 with SMTP id p137mr5838501wmb.51.1484211553078; Thu, 12 Jan 2017 00:59:13 -0800 (PST) Received: from cizrna.lan ([109.72.12.134]) by smtp.gmail.com with ESMTPSA id t194sm2181476wmd.1.2017.01.12.00.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2017 00:59:11 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v5 4/4] drm/rockchip: Implement CRC debugfs API Date: Thu, 12 Jan 2017 09:58:44 +0100 Message-Id: <20170112085844.19878-5-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170112085844.19878-1-tomeu.vizoso@collabora.com> References: <20170112085844.19878-1-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170112_005935_202349_08858E6B X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Tomeu Vizoso , David Airlie , Emil Velikov , dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Thierry Reding , Sean Paul , linux-arm-kernel@lists.infradead.org, Benjamin Gaignard , intel-gfx-trybot@lists.freedesktop.org, Daniel Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Mark Yao MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Tomeu Vizoso --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index fb5f001f51c3..6e5eb1aa182a 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 @@ -1105,6 +1106,46 @@ 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 rockchip_crtc_state *s = to_rockchip_crtc_state(crtc->state); + 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, @@ -1112,6 +1153,7 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { .reset = vop_crtc_reset, .atomic_duplicate_state = vop_crtc_duplicate_state, .atomic_destroy_state = vop_crtc_destroy_state, + .set_crc_source = vop_crtc_set_crc_source, }; static void vop_fb_unref_worker(struct drm_flip_work *work, void *val)