From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915/selftests: Convert timers to use timer_setup() Date: Wed, 25 Oct 2017 17:32:35 +0300 Message-ID: <873767i9h8.fsf@intel.com> References: <20171024151344.GA104417@beast> <150886182971.10869.7369355683667989865@mail.alporthouse.com> <150892705932.15898.5553340576421108752@mail.alporthouse.com> <150893706413.15898.193366470998027226@mail.alporthouse.com> <150894101376.15898.4850985227645404827@mail.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Kees Cook , Chris Wilson Cc: Tvrtko Ursulin , intel-gfx@lists.freedesktop.org, Joonas Lahtinen , LKML , Maling list - DRI developers , Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAyNSBPY3QgMjAxNywgS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1bS5vcmc+IHdy b3RlOgo+IE9uIFdlZCwgT2N0IDI1LCAyMDE3IGF0IDQ6MTYgUE0sIENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPiB3cm90ZToKPj4gUXVvdGluZyBLZWVzIENvb2sgKDIwMTct MTAtMjUgMTU6MDU6MTMpCj4+PiBPbiBXZWQsIE9jdCAyNSwgMjAxNyBhdCAzOjExIFBNLCBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4gd3JvdGU6Cj4+PiA+IFF1b3Rpbmcg Q2hyaXMgV2lsc29uICgyMDE3LTEwLTI1IDExOjI0OjE5KQo+Pj4gPj4gUXVvdGluZyBDaHJpcyBX aWxzb24gKDIwMTctMTAtMjQgMTc6MTc6MDkpCj4+PiA+PiA+IFF1b3RpbmcgS2VlcyBDb29rICgy MDE3LTEwLTI0IDE2OjEzOjQ0KQo+Pj4gPj4gPiA+IEluIHByZXBhcmF0aW9uIGZvciB1bmNvbmRp dGlvbmFsbHkgcGFzc2luZyB0aGUgc3RydWN0IHRpbWVyX2xpc3QgcG9pbnRlciB0bwo+Pj4gPj4g PiA+IGFsbCB0aW1lciBjYWxsYmFja3MsIHN3aXRjaCB0byB1c2luZyB0aGUgbmV3IHRpbWVyX3Nl dHVwKCkgYW5kIGZyb21fdGltZXIoKQo+Pj4gPj4gPiA+IHRvIHBhc3MgdGhlIHRpbWVyIHBvaW50 ZXIgZXhwbGljaXRseS4KPj4+ID4+ID4gPgo+Pj4gPj4gPiA+IENjOiBKYW5pIE5pa3VsYSA8amFu aS5uaWt1bGFAbGludXguaW50ZWwuY29tPgo+Pj4gPj4gPiA+IENjOiBKb29uYXMgTGFodGluZW4g PGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Cj4+PiA+PiA+ID4gQ2M6IFJvZHJpZ28g Vml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KPj4+ID4+ID4gPiBDYzogRGF2aWQgQWlybGll IDxhaXJsaWVkQGxpbnV4LmllPgo+Pj4gPj4gPiA+IENjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv LnVyc3VsaW5AaW50ZWwuY29tPgo+Pj4gPj4gPiA+IENjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KPj4+ID4+ID4gPiBDYzogaW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwo+Pj4gPj4gPiA+IENjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+ PiA+PiA+ID4gU2lnbmVkLW9mZi1ieTogS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1bS5vcmc+ Cj4+PiA+PiA+Cj4+PiA+PiA+IFRoYW5rIHlvdSBmb3Igc2F2aW5nIG1lIGZyb20gaGF2aW5nIHRv IGRvIHRoaXMgbXlzZWxmLAo+Pj4gPj4gPiBSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+Cj4+PiA+Pgo+Pj4gPj4gSSd2ZSBhIHNtYWxsIGJhdGNoIG9m IHNlbGZ0ZXN0cyBwYXRjaGVzIHF1ZXVlZCwgc28gYWRkZWQgdGhpcyBvbmUgYW5kCj4+PiA+PiB3 aWxsIHB1c2ggdG8gZHJtLWludGVsLW5leHQtcXVldWVkIHNob3J0bHkuCj4+PiA+Cj4+PiA+IE9o IGRlYXIsIG1ham9yIGZhdXggcGFzLiBUaGVyZSBpcyBubyB0aW1lcl9zZXR1cF9vbl9zdGFjayB5 ZXQuCj4+Pgo+Pj4gQXJnaC4gUmlnaHQsIHNvcnJ5LiBUaGF0J3Mgb25seSBpbiAtbmV4dC4gU2lu Y2UgdGhpcyBpcyBtYWlubHkgYQo+Pj4gbWVjaGFuaWNhbCBjaGFuZ2UsIHNob3VsZCBJIGNhcnJ5 IHRoaXMgaW4gdGhlIHRpbWVyIHRyZWUsIG9yIHdhaXQKPj4+IHVudGlsIHRoZSBtZXJnZSB3aW5k b3cgZm9yIGl0IHRvIGdvIHZpYSBpOTE1Pwo+Pgo+PiBKYW5pIGhhcyB0aGUgZmluYWwgd29yZCwg YnV0IG15IHVuZGVyc3RhbmRpbmcgaXMgdGhhdCB0aGVyZSB3aWxsIGJlIG5vCj4+IG1vcmUgZnJv bSBpOTE1IHRvd2FyZHMgdGhlIDQuMTUgbWVyZ2UuIEhtbSwgdGhlIG9yaWdpbiBvZiB0aGlzIHRp bWVyLAo+Pgo+PiBjb21taXQgMjE0NzA3ZmMyY2UwOGQwOTk4MmJjNGZlNGI3YTFjMWYwMTBlODJi ZQo+PiBBdXRob3I6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+PiBE YXRlOiAgIFRodSBPY3QgMTIgMTM6NTc6MjUgMjAxNyArMDEwMAo+Pgo+PiAgICAgZHJtL2k5MTUv c2VsZnRlc3RzOiBXcmFwIGEgdGltZXIgaW50byBhIGk5MTVfc3dfZmVuY2UKPj4KPj4gZGlkIG1h a2UgaXQgaW50byA0LjE1LCBzbyBpdCB3b3VsZCBoYXZlIGJlZW4gYmV0dGVyIHRvIHB1dCBpbnRv IGEKPj4gc2VwYXJhdGUgdHJlZSBmb3IgdGhlIDQuMTUgbWVyZ2Ugd2luZG93IGFueXdheS4gSW4g aGluZHNpZ2h0LCB5ZXMgdGhpcwo+PiBwcm9iYWJseSB3YW50cyB0byBiZSBjYXJyaWVkIGluIHRo ZSB0aW1lciB0cmVlIHRvIGJlIGFwcGxpZWQgYWZ0ZXIgaTkxNS4KPj4gKEkgZ3Vlc3MgdGhlcmUg d2lsbCBiZSBhIGZldyBvdGhlciBzdHJhZ2dsZXJzIHRoYXQgbmVlZCB0byBiZSBjb252ZXJ0ZWQK Pj4gYXQgdGhlIGVuZCBvZiB0aGUgbWVyZ2Ugd2luZG93IGFueXdheS4pCj4KPiBZZWFoLCBpdCdz IGdvaW5nIHRvIGJlIG1lc3N5LCBidXQgSSdsbCBtYW5hZ2UuIEknbGwgYmUgY2FycnlpbmcgYSBs b3QKPiBvZiBvdGhlciBzdHVmZiBhcyB3ZWxsLiBBdm9pZGluZyBjb25mbGljdHMgd2lsbCBiZSB0 aGUgdHJpY2suIFdoZWVlLgo+IDopCgpBY2tlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxh QGludGVsLmNvbT4KCmZvciBtZXJnaW5nIHZpYSB0aW1lciB0cmVlLiBPdGhlcndpc2Ugd2UnbGwg bmVlZCB0byB3YWl0IGZvciB0aGUgY2hhbmdlcwp0byBoaXQgTGludXMnIHRyZWUsIHRoZW4gZ2V0 IGJhY2ttZXJnZXMgdG8gb3VyIHRyZWUsIGFuZCBpdCdzIHY0LjE2CmJlZm9yZSB5b3Uga25vdyBp dC4gOykKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50 ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751956AbdJYObL (ORCPT ); Wed, 25 Oct 2017 10:31:11 -0400 Received: from mga11.intel.com ([192.55.52.93]:31200 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbdJYObK (ORCPT ); Wed, 25 Oct 2017 10:31:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,431,1503385200"; d="scan'208";a="913621997" From: Jani Nikula To: Kees Cook , Chris Wilson Cc: Joonas Lahtinen , Rodrigo Vivi , David Airlie , Tvrtko Ursulin , LKML , intel-gfx@lists.freedesktop.org, Maling list - DRI developers Subject: Re: [PATCH] drm/i915/selftests: Convert timers to use timer_setup() In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20171024151344.GA104417@beast> <150886182971.10869.7369355683667989865@mail.alporthouse.com> <150892705932.15898.5553340576421108752@mail.alporthouse.com> <150893706413.15898.193366470998027226@mail.alporthouse.com> <150894101376.15898.4850985227645404827@mail.alporthouse.com> Date: Wed, 25 Oct 2017 17:32:35 +0300 Message-ID: <873767i9h8.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 25 Oct 2017, Kees Cook wrote: > On Wed, Oct 25, 2017 at 4:16 PM, Chris Wilson wrote: >> Quoting Kees Cook (2017-10-25 15:05:13) >>> On Wed, Oct 25, 2017 at 3:11 PM, Chris Wilson wrote: >>> > Quoting Chris Wilson (2017-10-25 11:24:19) >>> >> Quoting Chris Wilson (2017-10-24 17:17:09) >>> >> > Quoting Kees Cook (2017-10-24 16:13:44) >>> >> > > In preparation for unconditionally passing the struct timer_list pointer to >>> >> > > all timer callbacks, switch to using the new timer_setup() and from_timer() >>> >> > > to pass the timer pointer explicitly. >>> >> > > >>> >> > > Cc: Jani Nikula >>> >> > > Cc: Joonas Lahtinen >>> >> > > Cc: Rodrigo Vivi >>> >> > > Cc: David Airlie >>> >> > > Cc: Tvrtko Ursulin >>> >> > > Cc: Chris Wilson >>> >> > > Cc: intel-gfx@lists.freedesktop.org >>> >> > > Cc: dri-devel@lists.freedesktop.org >>> >> > > Signed-off-by: Kees Cook >>> >> > >>> >> > Thank you for saving me from having to do this myself, >>> >> > Reviewed-by: Chris Wilson >>> >> >>> >> I've a small batch of selftests patches queued, so added this one and >>> >> will push to drm-intel-next-queued shortly. >>> > >>> > Oh dear, major faux pas. There is no timer_setup_on_stack yet. >>> >>> Argh. Right, sorry. That's only in -next. Since this is mainly a >>> mechanical change, should I carry this in the timer tree, or wait >>> until the merge window for it to go via i915? >> >> Jani has the final word, but my understanding is that there will be no >> more from i915 towards the 4.15 merge. Hmm, the origin of this timer, >> >> commit 214707fc2ce08d09982bc4fe4b7a1c1f010e82be >> Author: Chris Wilson >> Date: Thu Oct 12 13:57:25 2017 +0100 >> >> drm/i915/selftests: Wrap a timer into a i915_sw_fence >> >> did make it into 4.15, so it would have been better to put into a >> separate tree for the 4.15 merge window anyway. In hindsight, yes this >> probably wants to be carried in the timer tree to be applied after i915. >> (I guess there will be a few other stragglers that need to be converted >> at the end of the merge window anyway.) > > Yeah, it's going to be messy, but I'll manage. I'll be carrying a lot > of other stuff as well. Avoiding conflicts will be the trick. Wheee. > :) Acked-by: Jani Nikula for merging via timer tree. Otherwise we'll need to wait for the changes to hit Linus' tree, then get backmerges to our tree, and it's v4.16 before you know it. ;) -- Jani Nikula, Intel Open Source Technology Center