From patchwork Mon Jan 2 12:59:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9493469 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 4B86E62AC4 for ; Mon, 2 Jan 2017 13:00:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D8712679B for ; Mon, 2 Jan 2017 13:00:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32AE21FF35; Mon, 2 Jan 2017 13:00:15 +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 AC0D32679B for ; Mon, 2 Jan 2017 13:00:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43F0D6E412; Mon, 2 Jan 2017 12:59:57 +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 EBE3289F01; Mon, 2 Jan 2017 12:59:53 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id u144so81971911wmu.0; Mon, 02 Jan 2017 04:59:53 -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=kmlPgN5ML3HIW6nm2UPs7MQjQUUmIMk8xh/m1bS8iP0=; b=cMP5bMd1ssR4YfnvC/w26W6sS9XZtnNLpgljy7asY6vVBSoFpIMkThiHJjagpmJCRc F/hsSyfvPVDswW4f7yXxL13618qRxNTpnkfgljl9echhaeasX+iA6KrQF7mW+XPwMYm3 fc7LybnspLqLAsenx8RdQF+ekSlIL6umeh/mgDKVffDc2jkfuNl35CmVe4iqC//zuWFj 3QGctsxshbetoMKG3EosAAjoGxb4nOKJ1/SI21u1g7pSPASjSybJZ3QJjpebVHwP5EC2 5XBPyqz3zBGBxiGImlVYnvme43XTwWTpggl4Fxa4UWCm31MQV0h6c8j6VkFJKG4zMDkM pfHg== 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=kmlPgN5ML3HIW6nm2UPs7MQjQUUmIMk8xh/m1bS8iP0=; b=WJHfluYPro2G4YPI3qp7Pdw8ZznIZo689rQio2hLAIQ8soPUX3XScfc1RiMw56N26S GTYfJPrtPnoteQod4MDDl4lD3Lr7dy7fBfoGAzW6dWSNhHJ+moPdTjcJOkI+2SGAN9Gz nG6yuUQ2BazYDXieL16Ot9teJQImRGo/YiSlyf1tWMaZN0fNnvqlrYHjrRToq3efeXFq dkCKFonKBwkKGZtjxuj6H7aowF/UfVwRLgaFqWdglcfGzIFQqbVBAPlV6U55giCmx1WS IdGCRklJTqdapx0rc1Q0iszbaBB9eMA9JgVj0WjNzFNrbpqY/0q8EKNdmgaQ8If4jCtO kkqA== X-Gm-Message-State: AIkVDXL+c6iDzH4PSU4W5IyRsA9aVZ/DlqEb8Y9KHuvVExXLcHDyoVULTFmzD6GfhFB0uQ== X-Received: by 10.28.109.2 with SMTP id i2mr49152859wmc.41.1483361992115; Mon, 02 Jan 2017 04:59:52 -0800 (PST) Received: from cizrna.lan ([109.72.12.216]) by smtp.gmail.com with ESMTPSA id f126sm84058006wme.22.2017.01.02.04.59.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2017 04:59:51 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v14 4/4] drm/i915: Put "cooked" vlank counters in frame CRC lines Date: Mon, 2 Jan 2017 13:59:12 +0100 Message-Id: <20170102125912.22305-5-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170102125912.22305-1-tomeu.vizoso@collabora.com> References: <20170102125912.22305-1-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 Reviewed-by: Robert Foss --- 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 24b7620c1005..c0e3d1c1b4f0 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); }