diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2026-03-03 10:40:37 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2026-03-03 10:40:37 +0100 |
| commit | 6716101ae42949e98ad4b9e71eeba08c055be410 (patch) | |
| tree | 1a955ae5ca50348c6ed92f577efa7959a2a6aa10 /include/drm | |
| parent | ad595a8aeeabfbfcc0026b9892a8155bc0763416 (diff) | |
| parent | 17b95278ae6adb9ea5b801fcd2ae5d182448e99d (diff) | |
| download | linux-next-6716101ae42949e98ad4b9e71eeba08c055be410.tar.gz linux-next-6716101ae42949e98ad4b9e71eeba08c055be410.zip | |
Merge drm/drm-next into drm-misc-next
Backmerge fixes from v7.0-rc2 into drm-misc-next.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_suballoc.h | 6 | ||||
| -rw-r--r-- | include/drm/intel/pciids.h | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/drm/drm_suballoc.h b/include/drm/drm_suballoc.h index 7ba72a81a808..29befdda35d2 100644 --- a/include/drm/drm_suballoc.h +++ b/include/drm/drm_suballoc.h @@ -53,6 +53,12 @@ void drm_suballoc_manager_init(struct drm_suballoc_manager *sa_manager, void drm_suballoc_manager_fini(struct drm_suballoc_manager *sa_manager); +struct drm_suballoc *drm_suballoc_alloc(gfp_t gfp); + +int drm_suballoc_insert(struct drm_suballoc_manager *sa_manager, + struct drm_suballoc *sa, size_t size, bool intr, + size_t align); + struct drm_suballoc * drm_suballoc_new(struct drm_suballoc_manager *sa_manager, size_t size, gfp_t gfp, bool intr, size_t align); diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h index 52520e684ab1..33b91cb2e684 100644 --- a/include/drm/intel/pciids.h +++ b/include/drm/intel/pciids.h @@ -900,4 +900,16 @@ #define INTEL_CRI_IDS(MACRO__, ...) \ MACRO__(0x674C, ## __VA_ARGS__) +/* NVL-P */ +#define INTEL_NVLP_IDS(MACRO__, ...) \ + MACRO__(0xD750, ## __VA_ARGS__), \ + MACRO__(0xD751, ## __VA_ARGS__), \ + MACRO__(0xD752, ## __VA_ARGS__), \ + MACRO__(0xD753, ## __VA_ARGS__), \ + MACRO__(0XD754, ## __VA_ARGS__), \ + MACRO__(0XD755, ## __VA_ARGS__), \ + MACRO__(0XD756, ## __VA_ARGS__), \ + MACRO__(0XD757, ## __VA_ARGS__), \ + MACRO__(0xD75F, ## __VA_ARGS__) + #endif /* __PCIIDS_H__ */ |