diff options
| author | Daniel Vetter <[email protected]> | 2019-07-22 21:18:16 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2019-07-22 21:43:15 +0000 |
| commit | d808097627e51d53cf9b1aa13239b5c4a6adaefb (patch) | |
| tree | 6f73c9922feffe071dee9dbe09d4f18b3deeeae8 /drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | |
| parent | drm/bridge: Improve the help text for DRM_ANALOGIX_ANX78XX (diff) | |
| download | kernel-d808097627e51d53cf9b1aa13239b5c4a6adaefb.tar.gz kernel-d808097627e51d53cf9b1aa13239b5c4a6adaefb.zip | |
drm/i915: Fix up broken merge
Maxime didn't really compile-test this :-/
We need to re-apply
commit e4fa8457b2197118538a1400b75c898f9faaf164
Author: Daniel Vetter <[email protected]>
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 <[email protected]>
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 <[email protected]>
Cc: Chris Wilson <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Acked-by: Dave Airlie <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c')
0 files changed, 0 insertions, 0 deletions