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