From patchwork Thu Nov 17 09:27:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9433671 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 8C8F86047D for ; Thu, 17 Nov 2016 09:28:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D97C2939B for ; Thu, 17 Nov 2016 09:28:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 726CC2939F; Thu, 17 Nov 2016 09:28:01 +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 395FB2939B for ; Thu, 17 Nov 2016 09:28:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB72E6E79F; Thu, 17 Nov 2016 09:27:52 +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 B6CCE6E788; Thu, 17 Nov 2016 09:27:50 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id g23so19377458wme.1; Thu, 17 Nov 2016 01:27:50 -0800 (PST) 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=YecI4GLm0038MRZO6kTKpp7zJADicxf0m53f710uyD0=; b=xxzOVaMbytTf+sk/LT8zjqoIXt3xoFGmRptBX+6CIhSbH7WvpAd1QBcsBflEQCXi/5 vH26wTF5Y3RKTSVwcxOrUsMVto18pR16O783Pt9Slk8xP2fJcJz4G/rUj/E0WPjFmnDc CgjrbQaCi/JmHfoEjSVPAJUezTwT9bLzqrxIPy06f8zkMcGO1ApE7mgxMJiM4nKJYK/5 JpnrBv/HkrSFbH1QkU0pOKIQBW1xUxMWkLpAYug0HkYmjAnbhwN6xm4txyOkj+pFktYU NQEGLdr3CfGOvxVRzZ0sVUreZkEnIF2pUPfzC9jMvv21vB6wIzyMA+71TD4iMuqMfxDw ouYg== 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=YecI4GLm0038MRZO6kTKpp7zJADicxf0m53f710uyD0=; b=X6/8pHMILbwAUwc2zOocC7D0pJglpDu7zRXBwolqB5SNC0kJB9c66oYrcjL3AWXGEm BND3Qwe9CX3uOKtfpllVdenxHXaRoIOKmzNF1ISa4r+o+1ZTJref4xQeU5DLAsMZgjp0 M+vQ5kaxwt+BoKkO6Bzln3aTqWBPwI3cL8/ER0XoMFlpCkceau7egklbDSWL4zNvjCWG 7OammE2mjm2efW33lI1BUebz3Wxr+/FxLx7A8h5hE4RuaEUoF5D4p2PgGZX0HxLOUpyO cKthVBcRyxwmGNqaKUFoTyGjzQU+1SIAJI4QyDBSxqOwvVG3IAO0r0iQzjs/kryQPQhB UCeg== X-Gm-Message-State: AKaTC02GcnThoVMLnbMoL8KoOLXXD5O1kWUq4qJ74Rk5Qel6VtrZtxnr72AcVU3UdGL+0g== X-Received: by 10.28.214.84 with SMTP id n81mr2725414wmg.120.1479374869196; Thu, 17 Nov 2016 01:27:49 -0800 (PST) Received: from cizrna.lan ([109.72.12.131]) by smtp.gmail.com with ESMTPSA id t84sm14534370wmt.7.2016.11.17.01.27.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 01:27:48 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v12 4/4] drm/i915: Put "cooked" vlank counters in frame CRC lines Date: Thu, 17 Nov 2016 10:27:07 +0100 Message-Id: <1479374827-10642-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479374827-10642-1-git-send-email-tomeu.vizoso@collabora.com> References: <1479374827-10642-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , intel-gfx@lists.freedesktop.org, Emil Velikov , dri-devel@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" X-Virus-Scanned: ClamAV using ClamSMTP Use drm_accurate_vblank_count so we have the full 32 bit to represent the frame counter and userspace has a simpler way of knowing when the counter wraps around. Signed-off-by: Tomeu Vizoso Reviewed-by: Emil Velikov --- drivers/gpu/drm/i915/i915_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 7870a86d7209..c522a8b611b8 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1557,7 +1557,6 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, struct drm_driver *driver = dev_priv->drm.driver; uint32_t crcs[5]; int head, tail, ret; - u32 frame; spin_lock(&pipe_crc->lock); if (pipe_crc->source) { @@ -1612,8 +1611,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, crcs[2] = crc2; crcs[3] = crc3; crcs[4] = crc4; - frame = driver->get_vblank_counter(&dev_priv->drm, pipe); - ret = drm_crtc_add_crc_entry(&crtc->base, true, frame, crcs); + ret = drm_crtc_add_crc_entry(&crtc->base, true, + drm_accurate_vblank_count(&crtc->base), + crcs); if (!ret) wake_up_interruptible(&crtc->base.crc.wq); }