Re: [PATCH v4 34/38] drm: Wrap drm_mm_node.hole_follows

Chris Wilson
2016-12-28T18:47:56Z

On Wed, Dec 28, 2016 at 03:31:19PM +0100, Daniel Vetter wrote:
> On Wed, Dec 28, 2016 at 2:31 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > On Wed, Dec 28, 2016 at 02:02:27PM +0100, Daniel Vetter wrote:
> >> On Thu, Dec 22, 2016 at 08:36:37AM +0000, Chris Wilson wrote:
> >> > Insulate users from changes to the internal hole tracking within
> >> > struct drm_mm_node by using an accessor for hole_follows.
> >> >
> >> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >> > ---
> >> > drivers/gpu/drm/drm_mm.c | 12 ++++++------
> >> > drivers/gpu/drm/i915/i915_vma.c | 4 ++--
> >>
> >> This required some wragling in i915_vma.c to make it apply to drm-misc,
> >> and then resolving the conflict in drm-tip. Please double-check when
> >> rebasing that I didn't botch it up.
> >
> > You'll just have to undo it again in later patches. You might as well
> > wait until you have the trees converged.
>
> Well damage done, but there wasn't anything in later patches (yet).
> And with the merge it's resolved (or should be if I haven't botched
> the merges) and should look identical to your baseline again.

The changes were transparent; you did a good job - rebased cleanly and a
diff against the old head showed nothing mysterious.
-Chris

--
Chris Wilson, Intel Open Source Technology Centre