diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-07-23 00:18:16 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-07-23 00:43:15 +0300 |
| commit | d808097627e51d53cf9b1aa13239b5c4a6adaefb (patch) | |
| tree | 6f73c9922feffe071dee9dbe09d4f18b3deeeae8 /include/linux/fb.h | |
| parent | e858c5951f69d4eb15f51340d622ab1164c71ae8 (diff) | |
| download | linux-d808097627e51d53cf9b1aa13239b5c4a6adaefb.tar.xz | |
drm/i915: Fix up broken merge
Maxime didn't really compile-test this :-/
We need to re-apply
commit e4fa8457b2197118538a1400b75c898f9faaf164
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
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@chris-wilson.co.uk>
Date: Tue May 28 10:29:49 2019 +0100
drm/i915: Move more GEM objects under gem/
v2: Remember the selftests (Chris).
Fixes: 03b0f2ce735e ("Merge v5.3-rc1 into drm-misc-next")
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190722213759.26612-1-daniel.vetter@ffwll.ch
Diffstat (limited to 'include/linux/fb.h')
0 files changed, 0 insertions, 0 deletions