From: Chris Wilson <chris@chris-wilson.co.uk>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 08/12] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs
Date: Tue, 24 Nov 2015 15:10:15 +0000 [thread overview]
Message-ID: <20151124151015.GQ22980@nuc-i3427.alporthouse.com> (raw)
In-Reply-To: <20151124145813.GO17050@phenom.ffwll.local>
On Tue, Nov 24, 2015 at 03:58:13PM +0100, Daniel Vetter wrote:
> On Fri, Nov 20, 2015 at 12:43:48PM +0000, Chris Wilson wrote:
> > Having ringbuf->ring point to an engine is confusing, so rename it once
> > again to ring->engine.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> This massively conflicts with
>
> commit e84fe80337dc85cca07d0417ea97edbec4789d8b
> Author: Nick Hoath <nicholas.hoath@intel.com>
> Date: Fri Sep 11 12:53:46 2015 +0100
>
> drm/i915: Split alloc from init for lrc
>
> since this patch touches piles of old code now removed. But no functional
> conflict afaics, so Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Maybe rebase before sending ;-)
Depends on how much you value testing.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-11-24 15:10 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 12:43 [PATCH 01/12] drm/i915: Convert i915_semaphores_is_enabled over to drm_i915_private Chris Wilson
2015-11-20 12:43 ` [PATCH 02/12] drm/i915: Use the new rq->i915 field where appropriate Chris Wilson
2015-11-24 13:57 ` Daniel Vetter
2015-11-24 14:23 ` Chris Wilson
2015-11-24 14:41 ` Daniel Vetter
2015-11-20 12:43 ` [PATCH 03/12] drm/i915: Unify intel_logical_ring_emit and intel_ring_emit Chris Wilson
2015-11-24 14:33 ` Daniel Vetter
2015-11-24 14:52 ` Chris Wilson
2015-11-20 12:43 ` [PATCH 04/12] drm/i915: Unify intel_ring_begin() Chris Wilson
2015-11-24 14:38 ` Daniel Vetter
2015-11-24 14:58 ` Chris Wilson
2015-11-20 12:43 ` [PATCH 05/12] drm/i915: Remove the identical implementations of request space reservation Chris Wilson
2015-11-24 14:42 ` Daniel Vetter
2015-11-20 12:43 ` [PATCH 06/12] drm/i915: Rename request->ring to request->engine Chris Wilson
2015-11-24 14:48 ` Daniel Vetter
2015-11-20 12:43 ` [PATCH 07/12] drm/i915: Rename request->ringbuf to request->ring Chris Wilson
2015-11-24 14:51 ` Daniel Vetter
2015-11-24 15:08 ` Tvrtko Ursulin
2015-11-24 15:25 ` Chris Wilson
2015-11-25 10:22 ` Tvrtko Ursulin
2015-11-20 12:43 ` [PATCH 08/12] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs Chris Wilson
2015-11-24 14:58 ` Daniel Vetter
2015-11-24 15:10 ` Chris Wilson [this message]
2015-11-24 15:15 ` Chris Wilson
2015-11-24 15:36 ` Daniel Vetter
2015-11-20 12:43 ` [PATCH 09/12] drm/i915: Rename intel_context[engine].ringbuf Chris Wilson
2015-11-24 14:59 ` Daniel Vetter
2015-11-24 15:09 ` Tvrtko Ursulin
2015-11-24 15:27 ` Chris Wilson
2015-11-20 12:43 ` [PATCH 10/12] drm/i915: Reduce the pointer dance of i915_is_ggtt() Chris Wilson
2015-11-24 15:08 ` Daniel Vetter
2015-11-20 12:43 ` [PATCH 11/12] drm/i915: Remove request retirement before each batch Chris Wilson
2015-11-20 12:43 ` [PATCH 12/12] drm/i915: Cache the reset_counter for the request Chris Wilson
2015-11-24 16:43 ` Daniel Vetter
2015-11-24 21:43 ` Chris Wilson
2015-11-25 9:12 ` Daniel Vetter
2015-11-25 12:17 ` Chris Wilson
2015-11-26 9:21 ` Daniel Vetter
2015-11-26 9:50 ` Chris Wilson
2015-11-25 17:11 ` Chris Wilson
2015-11-24 13:52 ` [PATCH 01/12] drm/i915: Convert i915_semaphores_is_enabled over to drm_i915_private Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151124151015.GQ22980@nuc-i3427.alporthouse.com \
--to=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.