From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753083AbaLCOaD (ORCPT ); Wed, 3 Dec 2014 09:30:03 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:43650 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752504AbaLCOaA (ORCPT ); Wed, 3 Dec 2014 09:30:00 -0500 Date: Wed, 3 Dec 2014 15:30:29 +0100 From: Daniel Vetter To: John Stultz Cc: Chris Wilson , Daniel Vetter , Intel Graphics Development , LKML , Daniel Vetter , Thomas Gleixner Subject: Re: [Intel-gfx] [PATCH] drm/i915: compute wait_ioctl timeout correctly Message-ID: <20141203143029.GF32117@phenom.ffwll.local> Mail-Followup-To: John Stultz , Chris Wilson , Intel Graphics Development , LKML , Daniel Vetter , Thomas Gleixner References: <1417533733-2289-1-git-send-email-daniel.vetter@ffwll.ch> <1417534582-2977-1-git-send-email-daniel.vetter@ffwll.ch> <20141202163506.GG18921@nuc-i3427.alporthouse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 3.16-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 02, 2014 at 08:54:13AM -0800, John Stultz wrote: > On Tue, Dec 2, 2014 at 8:35 AM, Chris Wilson wrote: > > On Tue, Dec 02, 2014 at 04:36:22PM +0100, Daniel Vetter wrote: > >> +static inline unsigned long nsecs_to_jiffies_timeout(const u64 m) > >> +{ > >> + u64 usecs = div_u64(m + 999, 1000); > >> + unsigned long j = usecs_to_jiffies(usecs); > >> + > >> + return min_t(unsigned long, MAX_JIFFY_OFFSET, j + 1); > > > > Or more concisely and review friendly: > > > > static inline unsigned long nsecs_to_jiffies_timeout(const u64 n) > > { > > return min_t(u64, MAX_JIFFY_OFFSET, nsecs_to_jiffies64(n) + 1); > > } > > Yea. This looks much nicer. Seems generic enough it might be better > added next to nsec_to_jiffies64() in kernel/time/time.c or jiffies.h > rather then in a driver header. Ok, that needs an EXPORT_SYMBOL for nsecs_to_jiffies64. Can I count your "Yea" above as an ack for adding that and pulling it in through drm-intel.git? -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: compute wait_ioctl timeout correctly Date: Wed, 3 Dec 2014 15:30:29 +0100 Message-ID: <20141203143029.GF32117@phenom.ffwll.local> References: <1417533733-2289-1-git-send-email-daniel.vetter@ffwll.ch> <1417534582-2977-1-git-send-email-daniel.vetter@ffwll.ch> <20141202163506.GG18921@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EB0D73116 for ; Wed, 3 Dec 2014 06:30:00 -0800 (PST) Received: by mail-wg0-f42.google.com with SMTP id z12so19999303wgg.1 for ; Wed, 03 Dec 2014 06:29:59 -0800 (PST) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: John Stultz Cc: Daniel Vetter , Intel Graphics Development , LKML , Daniel Vetter , Thomas Gleixner List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBEZWMgMDIsIDIwMTQgYXQgMDg6NTQ6MTNBTSAtMDgwMCwgSm9obiBTdHVsdHogd3Jv dGU6Cj4gT24gVHVlLCBEZWMgMiwgMjAxNCBhdCA4OjM1IEFNLCBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4gd3JvdGU6Cj4gPiBPbiBUdWUsIERlYyAwMiwgMjAxNCBhdCAw NDozNjoyMlBNICswMTAwLCBEYW5pZWwgVmV0dGVyIHdyb3RlOgo+ID4+ICtzdGF0aWMgaW5saW5l IHVuc2lnbmVkIGxvbmcgbnNlY3NfdG9famlmZmllc190aW1lb3V0KGNvbnN0IHU2NCBtKQo+ID4+ ICt7Cj4gPj4gKyAgICAgdTY0IHVzZWNzID0gZGl2X3U2NChtICsgOTk5LCAxMDAwKTsKPiA+PiAr ICAgICB1bnNpZ25lZCBsb25nIGogPSB1c2Vjc190b19qaWZmaWVzKHVzZWNzKTsKPiA+PiArCj4g Pj4gKyAgICAgcmV0dXJuIG1pbl90KHVuc2lnbmVkIGxvbmcsIE1BWF9KSUZGWV9PRkZTRVQsIGog KyAxKTsKPiA+Cj4gPiBPciBtb3JlIGNvbmNpc2VseSBhbmQgcmV2aWV3IGZyaWVuZGx5Ogo+ID4K PiA+IHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbG9uZyBuc2Vjc190b19qaWZmaWVzX3RpbWVvdXQo Y29uc3QgdTY0IG4pCj4gPiB7Cj4gPiAgICAgICAgIHJldHVybiBtaW5fdCh1NjQsIE1BWF9KSUZG WV9PRkZTRVQsIG5zZWNzX3RvX2ppZmZpZXM2NChuKSArIDEpOwo+ID4gfQo+IAo+IFllYS4gVGhp cyBsb29rcyBtdWNoIG5pY2VyLiBTZWVtcyBnZW5lcmljIGVub3VnaCBpdCBtaWdodCBiZSBiZXR0 ZXIKPiBhZGRlZCBuZXh0IHRvIG5zZWNfdG9famlmZmllczY0KCkgaW4ga2VybmVsL3RpbWUvdGlt ZS5jIG9yIGppZmZpZXMuaAo+IHJhdGhlciB0aGVuIGluIGEgZHJpdmVyIGhlYWRlci4KCk9rLCB0 aGF0IG5lZWRzIGFuIEVYUE9SVF9TWU1CT0wgZm9yIG5zZWNzX3RvX2ppZmZpZXM2NC4gQ2FuIEkg Y291bnQgeW91cgoiWWVhIiBhYm92ZSBhcyBhbiBhY2sgZm9yIGFkZGluZyB0aGF0IGFuZCBwdWxs aW5nIGl0IGluIHRocm91Z2gKZHJtLWludGVsLmdpdD8KLURhbmllbAotLSAKRGFuaWVsIFZldHRl cgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KKzQxICgwKSA3OSAzNjUgNTcg NDggLSBodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=