diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-09-15 16:12:51 +0200 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-09-15 16:12:51 +0200 |
commit | d1b803f4ca4f25d6f171219d039f9410a10b29ee (patch) | |
tree | 44ce0f4ab320f9a3a63cf7518931c5209da6d94a /include/drm | |
parent | drm/i915/dg1: Add new PCI id (diff) | |
parent | Linux 5.15-rc1 (diff) | |
download | linux-d1b803f4ca4f25d6f171219d039f9410a10b29ee.tar.xz linux-d1b803f4ca4f25d6f171219d039f9410a10b29ee.zip |
Merge drm/drm-next into drm-intel-next
Catch-up on 5.15-rc1 and sync with drm-intel-gt-next
to prepare the PXP topic branch.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/ttm/ttm_tt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 818680c6a8ed..b20e89d321b0 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -27,11 +27,12 @@ #ifndef _TTM_TT_H_ #define _TTM_TT_H_ +#include <linux/pagemap.h> #include <linux/types.h> #include <drm/ttm/ttm_caching.h> #include <drm/ttm/ttm_kmap_iter.h> -struct ttm_bo_device; +struct ttm_device; struct ttm_tt; struct ttm_resource; struct ttm_buffer_object; |