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: 89488 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp7579775qgi; Mon, 2 Jan 2017 05:00:13 -0800 (PST) X-Received: by 10.98.16.7 with SMTP id y7mr53452267pfi.55.1483362013519; Mon, 02 Jan 2017 05:00:13 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p2si65640539pge.69.2017.01.02.05.00.13; Mon, 02 Jan 2017 05:00:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932750AbdABM74 (ORCPT + 25 others); Mon, 2 Jan 2017 07:59:56 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36758 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932325AbdABM7x (ORCPT ); Mon, 2 Jan 2017 07:59:53 -0500 Received: by mail-wm0-f65.google.com with SMTP id m203so81935682wma.3 for ; Mon, 02 Jan 2017 04:59:52 -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=NEufSJHC62pJeVOykmHzmWQCfs2uK/SlifmYcwdxXhDkMEiEdKa9JN9wPv0MnUtMb2 c93TAZ7cjo/YeDRLqd5qnTZMQKrHS99ggxoyi60YaB1hpFJZxLk2XtzzEzQXGeFu1b4i JuscoA2sNbZLihrADMyf7OWKP3gNkiCMGeksR0VJXowt78eo9cdbfror8l/QS2F6UFtg UjYz1GywaTaA/cRJI85GHiqt9yL4BA6l7bAPrW3/U5IjjMBpEZ1QKO8LN4QXmNRYErCO TabJNBumDwtInJAMq1VBPu29F8ov9+GlPPUf0UiHfQ1G6AGmdwcFEyxvgP6IKJ5km+wh VkAw== X-Gm-Message-State: AIkVDXK0CMPAOF/s61mdMxGPrP893fYVej61dz5jQxWBOm9juXcbSAXC9ramCxn2b0l8WQ== 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 Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Sean Paul , Thierry Reding , Emil Velikov , Daniel Vetter , Jani Nikula , Tomeu Vizoso , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, David Airlie 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.3 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); }