diff options
author | Paul Cercueil <paul@crapouillou.net> | 2022-04-18 20:44:36 +0100 |
---|---|---|
committer | Paul Cercueil <paul@crapouillou.net> | 2022-04-18 20:46:55 +0100 |
commit | 40f458b7816bd3ddddc068998523b4e039c04818 (patch) | |
tree | f88d18bd293fb646a53cc025fa72329b0f738e97 /drivers/gpu/drm/i915/gem/i915_gem_object.c | |
parent | drm/nouveau/gr/gf100-: change gf108_gr_fwif from global to static (diff) | |
parent | Merge tag 'drm-intel-next-2022-04-13-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
download | linux-dev-40f458b7816bd3ddddc068998523b4e039c04818.tar.xz linux-dev-40f458b7816bd3ddddc068998523b4e039c04818.zip |
Merge drm/drm-next into drm-misc-next
drm/drm-next has a build fix for the NewVision NV3052C panel
(drivers/gpu/drm/panel/panel-newvision-nv3052c.c), which needs to be
merged back to drm-misc-next, as it was failing to build there.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_object.c')
-rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 1c103c4dfaf4..747ac65e060f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -22,6 +22,7 @@ * */ +#include <linux/highmem.h> #include <linux/sched/mm.h> #include <drm/drm_cache.h> |