From patchwork Tue Mar 29 11:12:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8685781 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE33FC0553 for ; Tue, 29 Mar 2016 11:12:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14BC720295 for ; Tue, 29 Mar 2016 11:12:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 772652028D for ; Tue, 29 Mar 2016 11:12:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF4C26E5C0; Tue, 29 Mar 2016 11:12:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 06F8A6E57C for ; Tue, 29 Mar 2016 11:12:24 +0000 (UTC) Received: by mail-wm0-x233.google.com with SMTP id p65so21069980wmp.0 for ; Tue, 29 Mar 2016 04:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jmhfOOYToHIBGHWWwM0dCfo/pOO/6F2r1NEYZ6ylr/Q=; b=Vntn8ROLnVT22IPvpB5wfsD40ColElW79/Tzx1VOY3xEXArGJUcuEHI6iY/hfE4VQ+ 4N49mJJIHO5egczTdIqt81WWEx448WnFCGlTBesO+PVvk5zdr2t+2XTel4oOTsyCaLeW v7WmX8NBZ4HYgYFN166iFiYgp84gOorwd+ur4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jmhfOOYToHIBGHWWwM0dCfo/pOO/6F2r1NEYZ6ylr/Q=; b=LCgJ3hrPzNXSOrc9Hn9RloxViwYIcrBiey9vJ6+nX2DuqG73l+wzMMu9bYLw1Ffg+3 xwNBO+6QZF7ioVuLlc++y1evMcuPSkKjdyGfGAMobVoNDCc9O8pqtDO44qu20L+D8rHp Qv60BnqjMHKrm0N+nsgcnnTSUDV0Jt9Wr4HKjPUxcNP14U68BkQ0SgVewRzBhdlGsFq9 p2dgpadaoDoURv6tSAZhQjJkJyWaw4g78kdG+wiVtZRuo0vZSdUseBzv43EF7ZH9NpVT 6OFtMm8zHQ4j/4cwrPka2fIqaIipWgwp8Gs/tdwnLNkIWb/S1Y4ga6mQRpQaOLzr1uh9 AoSQ== X-Gm-Message-State: AD7BkJJ5JKPkJNqRTBfvjC0hne7ssjZHcftWLhwl2GOzJsA2DWkHtqtQv/AhZcbsq365/w== X-Received: by 10.194.118.106 with SMTP id kl10mr2310296wjb.154.1459249942009; Tue, 29 Mar 2016 04:12:22 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id c195sm14268256wmd.0.2016.03.29.04.12.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Mar 2016 04:12:21 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] Revert "drm: Don't pass negative delta to ktime_sub_ns()" Date: Tue, 29 Mar 2016 13:12:22 +0200 Message-Id: <1459249942-21589-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 MIME-Version: 1.0 Cc: Daniel Vetter , Intel Graphics Development , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Daniel Vetter , Dave Airlie , Thomas Gleixner 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit e91abf80a0998f326107874c88d549f94839f13c. Since commit 24e4a8c3e8868874835b0f1ad6dd417341e99822 Author: John Stultz Date: Wed Jul 16 21:03:53 2014 +0000 ktime: Kill non-scalar ktime_t implementation for 2038 there is no longer a 32bit version that's unsigned, and we don't have to jump through ridiculous hoops to make the calculations correct. I didn't look whether there's more of this pattern in the kernel. Cc: John Stultz Cc: Thomas Gleixner Cc: Michel Dänzer Cc: Imre Deak Cc: Dave Airlie Signed-off-by: Daniel Vetter Reviewed-by: Imre Deak --- drivers/gpu/drm/drm_irq.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index f77653562fac..4d06cf41df96 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -863,10 +863,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, /* Subtract time delta from raw timestamp to get final * vblank_time timestamp for end of vblank. */ - if (delta_ns < 0) - etime = ktime_add_ns(etime, -delta_ns); - else - etime = ktime_sub_ns(etime, delta_ns); + etime = ktime_sub_ns(etime, delta_ns); *vblank_time = ktime_to_timeval(etime); DRM_DEBUG_VBL("crtc %u : v 0x%x p(%d,%d)@ %ld.%ld -> %ld.%ld [e %d us, %d rep]\n",