From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: Re: [PATCH 1/4] drm/i915: add msecs_to_jiffies_timeout
 to guarantee minimum duration
Date: Wed, 22 May 2013 12:57:01 +0300
Message-ID: <1369216621.24656.7.camel@intelbox>
References: <1369155800-19654-1-git-send-email-imre.deak@intel.com>
	<87r4gzlak3.fsf@intel.com>
	<CAKMK7uFYZ_KUWyzUvW=XnOzB78k5yRnt=O1Ou7Tw0EZgYLg=LA@mail.gmail.com>
Reply-To: imre.deak@intel.com
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id 22A1AE5E16
	for <intel-gfx@lists.freedesktop.org>;
	Wed, 22 May 2013 02:57:04 -0700 (PDT)
In-Reply-To: <CAKMK7uFYZ_KUWyzUvW=XnOzB78k5yRnt=O1Ou7Tw0EZgYLg=LA@mail.gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Wed, 2013-05-22 at 11:46 +0200, Daniel Vetter wrote:
> On Wed, May 22, 2013 at 9:48 AM, Jani Nikula
> <jani.nikula@linux.intel.com> wrote:
> > On Tue, 21 May 2013, Imre Deak <imre.deak@intel.com> wrote:
> >> We need this to avoid premature timeouts whenever scheduling a timeout
> >> based on the current jiffies value. For an explanation see [1].
> >> The following patches will take the helper into use.
> >>
> >> Once the more generic solution proposed in the thread at [1] is accepted
> >> this patch can be reverted while keeping the follow-up patches.
> >>
> >> [1] http://marc.info/?l=linux-kernel&m=136854294730957&w=2
> >
> > With the name clashes, what happens when the generic solution is merged?
> > Blows up the build? To avoid confusion with merging upstream and
> > potential stable backports, should we err on the safe side and rename
> > these? Or add suitable trickery to use the generic version when
> > available?
> 
> linux-next should catch such fallout and we can fix up things in the
> merge. And since Linus has intel graphics I expect that he'll catch it
> if it fails to compile ;-)

Yea, I haven't thought this through properly. But after discussing with
Jani, this seems to be doable. I only hope Linus won't have to resolve
anything :)

--Imre