Re: [Intel-gfx] [PATCH] drm/i915: Fix up broken merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Quoting Daniel Vetter (2019-07-22 22:21:01)
> Maxime didn't really compile-test this :-/
> 
> We need to re-apply
> 
> commit e4fa8457b2197118538a1400b75c898f9faaf164
> Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Date:   Fri Jun 14 22:35:25 2019 +0200
> 
>     drm/prime: Align gem_prime_export with obj_funcs.export
> 
> plus make sure i915_gem_dma_buf.c doesn't get zombie-resurrect. It
> moved in
> 
> commit 10be98a77c558f8cfb823cd2777171fbb35040f6
> Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Date:   Tue May 28 10:29:49 2019 +0100
> 
>     drm/i915: Move more GEM objects under gem/
> 
> Fixes: 03b0f2ce735e ("Merge v5.3-rc1 into drm-misc-next")
> Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c |   5 +-
>  drivers/gpu/drm/i915/i915_gem_dmabuf.c     | 336 ---------------------

4 little fixes for the change in iface for
gem/selftests/i915_gem_dmabuf.c (plus git rm
selftests/i915_gem_dmabuf.c)
-Chris
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux