[PATCH] drm/i915: Update comment before i915_spin_request

[PATCH] drm/i915: Update comment before i915_spin_request

[Daniel Vetter]

~jiffie and a few usecs is 3 orders of magnitude different. A bit
much. This was changed in

commit ca5b721e238226af1d767103ac852aeb8e4c0764
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Dec 11 11:32:58 2015 +0000

    drm/i915: Limit the busy wait on requests to 5us not 10ms!

But probably missed the comment since the change was non-local to the
comment.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_request.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
index 3fecb8f0e041..1c7307f219f9 100644
--- a/drivers/gpu/drm/i915/i915_gem_request.c
+++ b/drivers/gpu/drm/i915/i915_gem_request.c
@@ -644,7 +644,7 @@ int i915_wait_request(struct drm_i915_gem_request *req,
 	if (IS_RPS_CLIENT(rps) && INTEL_GEN(req->i915) >= 6)
 		gen6_rps_boost(req->i915, rps, req->emitted_jiffies);
 
-	/* Optimistic spin for the next ~jiffie before touching IRQs */
+	/* Optimistic spin for the next usecs before touching IRQs */
 	if (i915_spin_request(req, state, 5))
 		goto complete;
 
-- 
2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Update comment before i915_spin_request

[Chris Wilson]

On Fri, Aug 05, 2016 at 06:11:24PM +0200, Daniel Vetter wrote:
> ~jiffie and a few usecs is 3 orders of magnitude different. A bit
> much. This was changed in
> 
> commit ca5b721e238226af1d767103ac852aeb8e4c0764
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date:   Fri Dec 11 11:32:58 2015 +0000
> 
>     drm/i915: Limit the busy wait on requests to 5us not 10ms!
> 
> But probably missed the comment since the change was non-local to the
> comment.

No, I was just using it as a pun referring to a jiffy being a small
amount of time.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Update comment before i915_spin_request

[Daniel Vetter]

On Fri, Aug 05, 2016 at 05:31:25PM +0100, Chris Wilson wrote:
> On Fri, Aug 05, 2016 at 06:11:24PM +0200, Daniel Vetter wrote:
> > ~jiffie and a few usecs is 3 orders of magnitude different. A bit
> > much. This was changed in
> > 
> > commit ca5b721e238226af1d767103ac852aeb8e4c0764
> > Author: Chris Wilson <chris@chris-wilson.co.uk>
> > Date:   Fri Dec 11 11:32:58 2015 +0000
> > 
> >     drm/i915: Limit the busy wait on requests to 5us not 10ms!
> > 
> > But probably missed the comment since the change was non-local to the
> > comment.
> 
> No, I was just using it as a pun referring to a jiffy being a small
> amount of time.

Too confusing in the context of the linux kernel ;-) Ack?
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Update comment before i915_spin_request

[Chris Wilson]

On Fri, Aug 05, 2016 at 06:33:38PM +0200, Daniel Vetter wrote:
> On Fri, Aug 05, 2016 at 05:31:25PM +0100, Chris Wilson wrote:
> > On Fri, Aug 05, 2016 at 06:11:24PM +0200, Daniel Vetter wrote:
> > > ~jiffie and a few usecs is 3 orders of magnitude different. A bit
> > > much. This was changed in
> > > 
> > > commit ca5b721e238226af1d767103ac852aeb8e4c0764
> > > Author: Chris Wilson <chris@chris-wilson.co.uk>
> > > Date:   Fri Dec 11 11:32:58 2015 +0000
> > > 
> > >     drm/i915: Limit the busy wait on requests to 5us not 10ms!
> > > 
> > > But probably missed the comment since the change was non-local to the
> > > comment.
> > 
> > No, I was just using it as a pun referring to a jiffy being a small
> > amount of time.
> 
> Too confusing in the context of the linux kernel ;-) Ack?

The comment is not improved by switching in usecs.

/* Optimistic short spin before touching IRQs */

would suffice.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Ro.CI.BAT: failure for drm/i915: Update comment before i915_spin_request

[Patchwork]

== Series Details ==

Series: drm/i915: Update comment before i915_spin_request
URL   : https://patchwork.freedesktop.org/series/10722/
State : failure

== Summary ==

Applying: drm/i915: Update comment before i915_spin_request
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_request.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_gem_request.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_request.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: Update comment before i915_spin_request
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx