From patchwork Thu Jan 14 14:39:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 8032271 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 331879F8AA for ; Thu, 14 Jan 2016 14:40:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65B2520453 for ; Thu, 14 Jan 2016 14:40:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8B5D820459 for ; Thu, 14 Jan 2016 14:40:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CDBF16E9E8; Thu, 14 Jan 2016 06:40:36 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metanate.com (dougal.metanate.com [90.155.101.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7EAB56E9E6 for ; Thu, 14 Jan 2016 06:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=LwrrPU22zkEOO05YDIOMNeGYASL/JlNN7XDvIc1AWWQ=; b=QAGKtNfGVxy9/Bt+Pdf6q/WNPy/wuBV5vwUuFI/uMpGxXdJD0z+crB3QxWSYeQNIxbOPvREG06CEtNyL564DUR8ZfmLWtm34JoeD9WXRCxG5PdV8eI66a2Ndb6G0hG0NVq5IpUC07C05P0ntc0lRgK6YrrWKTAyTecR1MitArJdygc3xU0ooyvDFwLLabc8SpwGtsDLgX86tek6iuxgzzVp7zsXYKaCz7/i41ywB++5u5C4q9/sEEGZkpf8BS7XzqcKPIFTnv50VdiQ9NpyxGSvGh0bOXVAE2R4ZEt1JYc2Gsq1XcPdZPEbUvNT2Kswkq9KXOpvdY7b79vTBIzTRzw==; Received: from brian ([192.168.88.1] helo=leela.metanate.com) by shrek.metanate.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1aJj4B-0002KU-8C; Thu, 14 Jan 2016 14:39:59 +0000 From: John Keeping To: Mark yao Subject: [PATCH 3/3] drm/rockchip: explain why we can't wait_for_vblanks Date: Thu, 14 Jan 2016 14:39:42 +0000 Message-Id: <107bbc36a316ed0ddc7b5a8bcd9b6db6cbc71d4f.1452782114.git.john@metanate.com> X-Mailer: git-send-email 2.7.0.226.gfe986fe In-Reply-To: References: In-Reply-To: References: <20160114142047.GD19130@phenom.ffwll.local> Cc: Linux Kernel Mailing List , dri-devel , "open list:ARM/Rockchip SoC..." , "linux-arm-kernel@lists.infradead.org" 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Signed-off-by: John Keeping --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 679d23a..b267ce4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -177,6 +177,12 @@ static void rockchip_crtc_wait_for_update(struct drm_crtc *crtc) crtc_funcs->wait_for_update(crtc); } +/* + * We can't use drm_atomic_helper_wait_for_vblanks() because rk3288 and rk3066 + * have hardware counters for neither vblanks nor scanlines. This function is + * equivalent but uses rockchip_crtc_wait_for_update() instead of waiting for + * vblank_count to change. + */ static void rockchip_atomic_wait_for_complete(struct drm_device *dev, struct drm_atomic_state *old_state) {