From patchwork Mon Dec 5 07:40:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 86504 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1351147qgi; Sun, 4 Dec 2016 23:42:25 -0800 (PST) X-Received: by 10.84.169.36 with SMTP id g33mr123921766plb.174.1480923745093; Sun, 04 Dec 2016 23:42:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si13785381plk.74.2016.12.04.23.42.24; Sun, 04 Dec 2016 23:42:25 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751975AbcLEHmV (ORCPT + 25 others); Mon, 5 Dec 2016 02:42:21 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33032 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751611AbcLEHlk (ORCPT ); Mon, 5 Dec 2016 02:41:40 -0500 Received: by mail-wm0-f67.google.com with SMTP id u144so14021295wmu.0 for ; Sun, 04 Dec 2016 23:41:40 -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=ZIJeNhhGEcgOrhVkhpRJ4e3w4lMKr6Zpmakg52JzZSU=; b=DtFIc2s1BdUC7GuQ5ngkzpznMQnlpiWKaV8sTQheWL7MlwqMTOwhRfakJ4NRszzhMt e/DFn6X7iJRK8GsAKosjZ3OsrOaCZQat92zvDjjwryRa8Bw46+BZa9FI8twp4ZvqyhHv Y7nuh4qmdNHYoaGezvCFMHAhkhvd5AsZVwEztthjIHJcaEon5FD7r6ocOKeamwbraaO1 YzSqlgNnkbhyCZhQEERseWcsjm0HVpLGWlfRa9f26TX1n1xt12mzfJii67fWcJ/wP0tF /sWtuP623a+6p/CtkJwgF7u68NaIy6rmWHCpUDMfQY61FH50fK1fvY7OthRVFPoBJBjM P/TA== 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=ZIJeNhhGEcgOrhVkhpRJ4e3w4lMKr6Zpmakg52JzZSU=; b=PTL/VONxVNuAxbvJY1f6xYNgFzK4bAHDksIayYeA0uCdNjQFuXw+0zFzc09dCt4NbX 7+D1Pt5ienR197jWL5NXIsDcdD69FhemE9/RTkWjbZz3fnj9JllleeYolAyeKqDXCs6y EtL37PY3KgpR6o3EghSMh1Zj9FrP+JE1jhokbmzUFqAP3i32vrlgsTifJ7eWr2bszcQI RytM1uny3S0xlKvri04U248ASIMNfcq9KbsR49lrpklxeGv7cqzNuLM5e3mextHO7IIR 8NqsKgGj7HI1Q4KK1z8lA8I23U602hrayV6ZdIj/99tSGynwzGOggk3Vwpv2g/012NHX Smig== X-Gm-Message-State: AKaTC02K4gvVFhCac0MdnQfuwuxdzH56Y2sY1VGbtzK6sAj2iFEz507lAbjAv2l3n5jOkw== X-Received: by 10.28.151.136 with SMTP id z130mr8514574wmd.126.1480923699471; Sun, 04 Dec 2016 23:41:39 -0800 (PST) Received: from cizrna.lan ([109.72.12.105]) by smtp.gmail.com with ESMTPSA id c81sm16508859wmf.22.2016.12.04.23.41.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Dec 2016 23:41:38 -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: [RESEND PATCH v12 4/4] drm/i915: Put "cooked" vlank counters in frame CRC lines Date: Mon, 5 Dec 2016 08:40:57 +0100 Message-Id: <1480923657-7908-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480923657-7908-1-git-send-email-tomeu.vizoso@collabora.com> References: <1480923657-7908-1-git-send-email-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 --- drivers/gpu/drm/i915/i915_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2eac6ed0f653..a395fe0fb4f3 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); }