summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm_pciids.txt1
-rw-r--r--shared-core/i915_dma.c3
-rw-r--r--shared-core/i915_drm.h5
3 files changed, 5 insertions, 4 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 0b95fe76..dc921d9d 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -278,6 +278,7 @@
0x8086 0x2982 0 "Intel i965G"
0x8086 0x2992 0 "Intel i965Q"
0x8086 0x29A2 0 "Intel i965G"
+0x8086 0x2A02 0 "Intel Crestline"
[imagine]
0x105d 0x2309 IMAGINE_128 "Imagine 128"
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 943a1772..cd7d2b43 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -34,7 +34,8 @@
#define IS_I965G(dev) (dev->pci_device == 0x2972 || \
dev->pci_device == 0x2982 || \
dev->pci_device == 0x2992 || \
- dev->pci_device == 0x29A2)
+ dev->pci_device == 0x29A2 || \
+ dev->pci_device == 0x2A02)
/* Really want an OS-independent resettable timer. Would like to have
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
index 22a81d14..b7cffbd7 100644
--- a/shared-core/i915_drm.h
+++ b/shared-core/i915_drm.h
@@ -151,8 +151,8 @@ typedef struct _drm_i915_sarea {
#define DRM_I915_DESTROY_HEAP 0x0c
#define DRM_I915_SET_VBLANK_PIPE 0x0d
#define DRM_I915_GET_VBLANK_PIPE 0x0e
-#define DRM_I915_VBLANK_SWAP 0x0f
-#define DRM_I915_MMIO 0x10
+#define DRM_I915_VBLANK_SWAP 0x0f
+#define DRM_I915_MMIO 0x10
#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
#define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -171,7 +171,6 @@ typedef struct _drm_i915_sarea {
#define DRM_IOCTL_I915_GET_VBLANK_PIPE DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
#define DRM_IOCTL_I915_VBLANK_SWAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-
/* Allow drivers to submit batchbuffers directly to hardware, relying
* on the security mechanisms provided by hardware.
*/