From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932073AbaLDKmD (ORCPT ); Thu, 4 Dec 2014 05:42:03 -0500 Received: from mail-wg0-f52.google.com ([74.125.82.52]:47098 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751391AbaLDKl7 (ORCPT ); Thu, 4 Dec 2014 05:41:59 -0500 Date: Thu, 4 Dec 2014 11:42:28 +0100 From: Daniel Vetter To: John Stultz Cc: Chris Wilson , Intel Graphics Development , LKML , Daniel Vetter , Thomas Gleixner , Daniel Vetter Subject: Re: [Intel-gfx] [PATCH] drm/i915: compute wait_ioctl timeout correctly Message-ID: <20141204104228.GJ32117@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> <20141203143029.GF32117@phenom.ffwll.local> 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 Wed, Dec 03, 2014 at 11:07:08AM -0800, John Stultz wrote: > On Wed, Dec 3, 2014 at 6:30 AM, Daniel Vetter wrote: > > 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? > > Do you need an EXPORT_SYMBOL if you add the _timeout version next to > nsecs_to_jiffies64 in time.c? I wouldn't but the patch from Imre to add all the _timeout was killed with a few bikesheds so really not volunteering. And just moving this single one doesn't make a lot of sense imo. Also the next patch I'll do is just add the +1 that we lost to the code and call it a day, really ;-) > Otherwise no objections to the approach, but I'd like to properly do > an Acked-by: after I see the patch. :) I'll send it out. -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: Thu, 4 Dec 2014 11:42:28 +0100 Message-ID: <20141204104228.GJ32117@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> <20141203143029.GF32117@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C2C36E99E for ; Thu, 4 Dec 2014 02:41:59 -0800 (PST) Received: by mail-wi0-f176.google.com with SMTP id ex7so34203698wid.15 for ; Thu, 04 Dec 2014 02:41:58 -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 T24gV2VkLCBEZWMgMDMsIDIwMTQgYXQgMTE6MDc6MDhBTSAtMDgwMCwgSm9obiBTdHVsdHogd3Jv dGU6Cj4gT24gV2VkLCBEZWMgMywgMjAxNCBhdCA2OjMwIEFNLCBEYW5pZWwgVmV0dGVyIDxkYW5p ZWxAZmZ3bGwuY2g+IHdyb3RlOgo+ID4gT24gVHVlLCBEZWMgMDIsIDIwMTQgYXQgMDg6NTQ6MTNB TSAtMDgwMCwgSm9obiBTdHVsdHogd3JvdGU6Cj4gPj4gT24gVHVlLCBEZWMgMiwgMjAxNCBhdCA4 OjM1IEFNLCBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4gd3JvdGU6Cj4g Pj4gPiBPbiBUdWUsIERlYyAwMiwgMjAxNCBhdCAwNDozNjoyMlBNICswMTAwLCBEYW5pZWwgVmV0 dGVyIHdyb3RlOgo+ID4+ID4+ICtzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGxvbmcgbnNlY3NfdG9f amlmZmllc190aW1lb3V0KGNvbnN0IHU2NCBtKQo+ID4+ID4+ICt7Cj4gPj4gPj4gKyAgICAgdTY0 IHVzZWNzID0gZGl2X3U2NChtICsgOTk5LCAxMDAwKTsKPiA+PiA+PiArICAgICB1bnNpZ25lZCBs b25nIGogPSB1c2Vjc190b19qaWZmaWVzKHVzZWNzKTsKPiA+PiA+PiArCj4gPj4gPj4gKyAgICAg cmV0dXJuIG1pbl90KHVuc2lnbmVkIGxvbmcsIE1BWF9KSUZGWV9PRkZTRVQsIGogKyAxKTsKPiA+ PiA+Cj4gPj4gPiBPciBtb3JlIGNvbmNpc2VseSBhbmQgcmV2aWV3IGZyaWVuZGx5Ogo+ID4+ID4K PiA+PiA+IHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbG9uZyBuc2Vjc190b19qaWZmaWVzX3RpbWVv dXQoY29uc3QgdTY0IG4pCj4gPj4gPiB7Cj4gPj4gPiAgICAgICAgIHJldHVybiBtaW5fdCh1NjQs IE1BWF9KSUZGWV9PRkZTRVQsIG5zZWNzX3RvX2ppZmZpZXM2NChuKSArIDEpOwo+ID4+ID4gfQo+ ID4+Cj4gPj4gWWVhLiBUaGlzIGxvb2tzIG11Y2ggbmljZXIuIFNlZW1zIGdlbmVyaWMgZW5vdWdo IGl0IG1pZ2h0IGJlIGJldHRlcgo+ID4+IGFkZGVkIG5leHQgdG8gbnNlY190b19qaWZmaWVzNjQo KSBpbiBrZXJuZWwvdGltZS90aW1lLmMgb3IgamlmZmllcy5oCj4gPj4gcmF0aGVyIHRoZW4gaW4g YSBkcml2ZXIgaGVhZGVyLgo+ID4KPiA+IE9rLCB0aGF0IG5lZWRzIGFuIEVYUE9SVF9TWU1CT0wg Zm9yIG5zZWNzX3RvX2ppZmZpZXM2NC4gQ2FuIEkgY291bnQgeW91cgo+ID4gIlllYSIgYWJvdmUg YXMgYW4gYWNrIGZvciBhZGRpbmcgdGhhdCBhbmQgcHVsbGluZyBpdCBpbiB0aHJvdWdoCj4gPiBk cm0taW50ZWwuZ2l0Pwo+IAo+IERvIHlvdSBuZWVkIGFuIEVYUE9SVF9TWU1CT0wgaWYgeW91IGFk ZCB0aGUgX3RpbWVvdXQgdmVyc2lvbiBuZXh0IHRvCj4gbnNlY3NfdG9famlmZmllczY0IGluIHRp bWUuYz8KCkkgd291bGRuJ3QgYnV0IHRoZSBwYXRjaCBmcm9tIEltcmUgdG8gYWRkIGFsbCB0aGUg X3RpbWVvdXQgd2FzIGtpbGxlZCB3aXRoCmEgZmV3IGJpa2VzaGVkcyBzbyByZWFsbHkgbm90IHZv bHVudGVlcmluZy4gQW5kIGp1c3QgbW92aW5nIHRoaXMgc2luZ2xlCm9uZSBkb2Vzbid0IG1ha2Ug YSBsb3Qgb2Ygc2Vuc2UgaW1vLiBBbHNvIHRoZSBuZXh0IHBhdGNoIEknbGwgZG8gaXMganVzdAph ZGQgdGhlICsxIHRoYXQgd2UgbG9zdCB0byB0aGUgY29kZSBhbmQgY2FsbCBpdCBhIGRheSwgcmVh bGx5IDstKQoKPiBPdGhlcndpc2Ugbm8gb2JqZWN0aW9ucyB0byB0aGUgYXBwcm9hY2gsIGJ1dCBJ J2QgbGlrZSB0byBwcm9wZXJseSBkbwo+IGFuIEFja2VkLWJ5OiBhZnRlciBJIHNlZSB0aGUgcGF0 Y2guIDopCgpJJ2xsIHNlbmQgaXQgb3V0LgotRGFuaWVsCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3 YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgorNDEgKDApIDc5IDM2NSA1NyA0OCAtIGh0 dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==