From c2e891677343c2f81470d588ba13e92c1aa01ef0 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Thu, 3 Nov 2016 10:01:12 +0000 Subject: [PATCH] ddk: update includes git-svn-id: svn://kolibrios.org@6659 a494cfbc-eb01-0410-851d-a64ba20cac60 --- drivers/include/asm/atomic64_32.h | 3 +-- drivers/include/drm/drmP.h | 3 +++ drivers/include/drm/i915_pciids.h | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/include/asm/atomic64_32.h b/drivers/include/asm/atomic64_32.h index 85d5450ae5..c84ecfa5c6 100644 --- a/drivers/include/asm/atomic64_32.h +++ b/drivers/include/asm/atomic64_32.h @@ -3,8 +3,7 @@ #include #include -#include -#include +//#include /* An 64bit atomic type */ diff --git a/drivers/include/drm/drmP.h b/drivers/include/drm/drmP.h index 8154209e5d..a06cd4d8eb 100644 --- a/drivers/include/drm/drmP.h +++ b/drivers/include/drm/drmP.h @@ -741,6 +741,9 @@ struct drm_device { // struct drm_agp_head *agp; /**< AGP data */ struct pci_dev *pdev; /**< PCI device structure */ +#ifdef __alpha__ + struct pci_controller *hose; +#endif unsigned int num_crtcs; /**< Number of CRTCs on this device */ diff --git a/drivers/include/drm/i915_pciids.h b/drivers/include/drm/i915_pciids.h index 17c445612e..2cdc723d75 100644 --- a/drivers/include/drm/i915_pciids.h +++ b/drivers/include/drm/i915_pciids.h @@ -277,7 +277,9 @@ INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */ #define INTEL_SKL_GT3_IDS(info) \ + INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \ + INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \ INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \ @@ -289,6 +291,8 @@ #define INTEL_BXT_IDS(info) \ INTEL_VGA_DEVICE(0x0A84, info), \ INTEL_VGA_DEVICE(0x1A84, info), \ - INTEL_VGA_DEVICE(0x5A84, info) + INTEL_VGA_DEVICE(0x1A85, info), \ + INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \ + INTEL_VGA_DEVICE(0x5A85, info) /* APL HD Graphics 500 */ #endif /* _I915_PCIIDS_H */