From patchwork Thu Oct 6 15:21:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9364955 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 8C3F66077E for ; Thu, 6 Oct 2016 15:21:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E9E82904A for ; Thu, 6 Oct 2016 15:21:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7332F29098; Thu, 6 Oct 2016 15:21:46 +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 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 BE415290A2 for ; Thu, 6 Oct 2016 15:21:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DEF86EA01; Thu, 6 Oct 2016 15:21:39 +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 DE6836E9FC; Thu, 6 Oct 2016 15:21:33 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id 123so4006420wmb.3; Thu, 06 Oct 2016 08:21:33 -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=2O2IOY5HAIT2Uwf72L1S6BLUBKvmiTPaZ16OVFXbbCY=; b=yYt8PNdWiMHCyxeV6xf+w4yic/NAX6Ea2ow6ornKtPSMXXbpcV2ZpG5o6xJGVqcdAI JOMPwufxl7h4fPQyysjPTdBKxArq0okLZ0e1Kkl0HSeC8O+j4dCgmecxv/kKCApoX6c3 bkVZUMfKZn0p9VZHHOgFfXyHx6gTwGOXQv6Sx29VL7EBO/sSDaP+p/hdLLMDwLuz/LV+ t9cRgWQo6cvzYKpRWzK8KxLlr2sDKa+EI48cgYkIWOE5VH1/231kRHLG6ggl81Cfedt8 3dXZndHt91S0vCE+upBvB14KN0sSOo5KjYA3z/lyG7dg1wo++SIILpmkgXzrQ96pTTq5 TxkA== 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=2O2IOY5HAIT2Uwf72L1S6BLUBKvmiTPaZ16OVFXbbCY=; b=lEkkRaCg0Gnn51YvSU4AD3Ll8d1AXOuDpGjqtkjj2V1P/TZRvlzoGGvnOTWIgnMy+j 0EYK6yL3ka0PmHbtOyyAmg9Zx5w8pYyCN8OirjI4tD7s2qemvL4OM3mDoYM073sfOwR8 Qs5gabU5pa6f9qgNU3XLqXn4NNodKNmd6htw8Wo6LTZSecWK+nSknfIdBob9xu+302HZ CiRTELdIa6y7ijY06l1u1dnXvhFS1bdZgI6BFlOHYQOWPiWH1sj/qyAdaOQXqUUtsDS3 HciN84ytfojZvAwQ6wLN1ZbEDWoO57ZBZGEUws70KGqx7CWsPfIoUL8OH3wIQXaJQQcX EVrQ== X-Gm-Message-State: AA6/9Rmc1tdAKOXeIuZpwJn9epucxnsWWy70S3ARGSWFvkXDFxs+/rzWGVhQUOzIrrzZ+w== X-Received: by 10.28.207.77 with SMTP id f74mr22500787wmg.35.1475767292095; Thu, 06 Oct 2016 08:21:32 -0700 (PDT) Received: from cizrna.lan ([109.72.12.69]) by smtp.gmail.com with ESMTPSA id m188sm13927894wma.19.2016.10.06.08.21.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Oct 2016 08:21:31 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v11 4/4] drm/i915: Put "cooked" vlank counters in frame CRC lines Date: Thu, 6 Oct 2016 17:21:08 +0200 Message-Id: <1475767268-14379-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475767268-14379-1-git-send-email-tomeu.vizoso@collabora.com> References: <1475767268-14379-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 1549cc4f88ec..238a353454e9 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1495,7 +1495,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) { @@ -1551,8 +1550,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, true, frame, crcs); + ret = drm_crtc_add_crc_entry(crtc, true, + drm_accurate_vblank_count(crtc), + crcs); spin_unlock(&crtc->crc.lock); if (!ret) wake_up_interruptible(&crtc->crc.wq);