From patchwork Mon Sep 5 09:58:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 9313347 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 BDCED6075E for ; Mon, 5 Sep 2016 09:59:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A881F28A1E for ; Mon, 5 Sep 2016 09:59:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CF1D28A2B; Mon, 5 Sep 2016 09:59:03 +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 62F5428A1E for ; Mon, 5 Sep 2016 09:59:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 209B46E3A2; Mon, 5 Sep 2016 09:59:00 +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 198036E3A6; Mon, 5 Sep 2016 09:58:58 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id l65so4672916wmf.3; Mon, 05 Sep 2016 02:58:58 -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=uPaLeiOMpNiCltbXquNVVC0Q5NosADvRv/BJsqGF+kY=; b=lcnvOoJXydw6PLW+MHcSx+qJ3jn+gWFct1XFFdPvCkGKvDfStYwhMbpXoM2nTRjicK ccdOhFwiFIfHmxxBiWpiEbAiqVEJDHHNxZI+SOgPhVbyHaZeBzqWetNIkCvpSx3h9ibZ MWbiniZDTNSs45hBblCKtdeSVgcPpNpla8JNxPNojjx317rgCfTT7qQtvKcNllHG04yN PtiNcXEM4kEySJ2htdPTCWxQvH1Q/JR3gVrlN/UlHhgkowrFSdV3QD0VXapc12W5cEHS AUz/zGcJLHrAixzJ5imvmmZyUfnQ/2o7zmclZ1XFkOZEwbMfet75+9LR0J4rLnCVUqhC /7VQ== 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=uPaLeiOMpNiCltbXquNVVC0Q5NosADvRv/BJsqGF+kY=; b=bwFtz9s5sdKdUwzWIaxBLgvaoHOr8WCRhdPGjvFjw5zprdRv1tPFkqXMV6Y0hsSmit cC24GtexL9+NAm0bzHHNmKFRaN3Yjeh8D/LdAjVfhfdTeeCkZJnDJyA2uKXw1px3eJhF 0/hXNvi4pgiT1e7q2ihNZBt+nOwcJhSwVrYVoLA0SDNpNVd9HHw+50HlOn/W5e8Lu49u XJxACFYhhc1zKkAwUf++W+yULMWu763WLbrYNrmwGgZBTjxXUtE45lIW4fontc08PVPG MTrls21K2pl6m6JfyrErGFjOlQ5Uw4zFy/GwHfLMDBAr8vqu44UrpRRH6WdMupWgx/D2 UOrw== X-Gm-Message-State: AE9vXwPiDSya1gm10rsFGpXcXTycZ88XUJUVEDSSXDpfD/IT5mHSyDklNdkIOMo3stJfsg== X-Received: by 10.194.223.40 with SMTP id qr8mr34555904wjc.16.1473069536664; Mon, 05 Sep 2016 02:58:56 -0700 (PDT) Received: from cizrna.lan ([109.72.12.101]) by smtp.gmail.com with ESMTPSA id r6sm5692917wme.6.2016.09.05.02.58.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Sep 2016 02:58:55 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Subject: [PATCH v5 4/4] drm/i915: Put "cooked" vlank counters in frame CRC lines Date: Mon, 5 Sep 2016 11:58:17 +0200 Message-Id: <1473069497-1585-5-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473069497-1585-1-git-send-email-tomeu.vizoso@collabora.com> References: <1473069497-1585-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Tomeu Vizoso , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Emil Velikov 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 --- 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 413667497ce0..32a5f4634d6d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1489,7 +1489,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) { @@ -1545,8 +1544,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);