diff options
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_crtc.h | 4 | ||||
| -rw-r--r-- | include/drm/i915_pciids.h | 28 |
2 files changed, 23 insertions, 9 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 920e21a8f3fd..b1465d6fbe94 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
| @@ -202,6 +202,7 @@ struct drm_framebuffer { | |||
| 202 | const struct drm_framebuffer_funcs *funcs; | 202 | const struct drm_framebuffer_funcs *funcs; |
| 203 | unsigned int pitches[4]; | 203 | unsigned int pitches[4]; |
| 204 | unsigned int offsets[4]; | 204 | unsigned int offsets[4]; |
| 205 | uint64_t modifier[4]; | ||
| 205 | unsigned int width; | 206 | unsigned int width; |
| 206 | unsigned int height; | 207 | unsigned int height; |
| 207 | /* depth can be 15 or 16 */ | 208 | /* depth can be 15 or 16 */ |
| @@ -1155,6 +1156,9 @@ struct drm_mode_config { | |||
| 1155 | /* whether async page flip is supported or not */ | 1156 | /* whether async page flip is supported or not */ |
| 1156 | bool async_page_flip; | 1157 | bool async_page_flip; |
| 1157 | 1158 | ||
| 1159 | /* whether the driver supports fb modifiers */ | ||
| 1160 | bool allow_fb_modifiers; | ||
| 1161 | |||
| 1158 | /* cursor size */ | 1162 | /* cursor size */ |
| 1159 | uint32_t cursor_width, cursor_height; | 1163 | uint32_t cursor_width, cursor_height; |
| 1160 | }; | 1164 | }; |
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 180ad0e6de21..38a7c8049e47 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h | |||
| @@ -259,21 +259,31 @@ | |||
| 259 | INTEL_VGA_DEVICE(0x22b2, info), \ | 259 | INTEL_VGA_DEVICE(0x22b2, info), \ |
| 260 | INTEL_VGA_DEVICE(0x22b3, info) | 260 | INTEL_VGA_DEVICE(0x22b3, info) |
| 261 | 261 | ||
| 262 | #define INTEL_SKL_IDS(info) \ | 262 | #define INTEL_SKL_GT1_IDS(info) \ |
| 263 | INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \ | ||
| 264 | INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \ | 263 | INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \ |
| 265 | INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \ | ||
| 266 | INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \ | ||
| 267 | INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \ | 264 | INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \ |
| 265 | INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \ | ||
| 266 | INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \ | ||
| 267 | INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */ | ||
| 268 | |||
| 269 | #define INTEL_SKL_GT2_IDS(info) \ | ||
| 270 | INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \ | ||
| 271 | INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \ | ||
| 268 | INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \ | 272 | INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \ |
| 269 | INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \ | 273 | INTEL_VGA_DEVICE(0x1912, info), /* DT GT2 */ \ |
| 270 | INTEL_VGA_DEVICE(0x1902, info), /* DT GT1 */ \ | ||
| 271 | INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \ | 274 | INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \ |
| 272 | INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \ | ||
| 273 | INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \ | ||
| 274 | INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \ | 275 | INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \ |
| 275 | INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \ | ||
| 276 | INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \ | ||
| 277 | INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */ | 276 | INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */ |
| 278 | 277 | ||
| 278 | #define INTEL_SKL_GT3_IDS(info) \ | ||
| 279 | INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \ | ||
| 280 | INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \ | ||
| 281 | INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \ | ||
| 282 | |||
| 283 | #define INTEL_SKL_IDS(info) \ | ||
| 284 | INTEL_SKL_GT1_IDS(info), \ | ||
| 285 | INTEL_SKL_GT2_IDS(info), \ | ||
| 286 | INTEL_SKL_GT3_IDS(info) | ||
| 287 | |||
| 288 | |||
| 279 | #endif /* _I915_PCIIDS_H */ | 289 | #endif /* _I915_PCIIDS_H */ |