diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-01 14:07:44 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-01 14:07:44 +0000 |
| commit | 1e835387bb70b249ab5793a1efad5e8e0ecf88c8 (patch) | |
| tree | 4446e38227a4ac58254a0a362861df15e82b98ec /sys/dev/pci/drm/i915/i915_drv.h | |
| parent | 7841a1b5b2eb958adff3704b5aab61cba8b98461 (diff) | |
Bring in some commits from Rodrigo Vivi in linux to correct
the IS_BDW_ULT macro.
drm/i915: BDW Fix Halo PCI IDs marked as ULT.
6b96d705f3cf435b0b8835b12c9742513c77fed6 in mainline linux
This will prevent the desktop "Iris Pro Graphics 6200" from being
misidentified as ULT.
drm/i915/bdw: PCI IDs ending in 0xb are ULT.
0dc6f20b9803f09726bbb682649d35cda8ef5b5d in mainline linux
This will make the mobile "Iris Graphics 6100" be correctly
identified as being a ULT part.
Diffstat (limited to 'sys/dev/pci/drm/i915/i915_drv.h')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index d02ff5973f2..21e99f91a06 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.h,v 1.71 2015/10/29 07:47:03 kettenis Exp $ */ +/* $OpenBSD: i915_drv.h,v 1.72 2015/11/01 14:07:43 jsg Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ /* @@ -1946,8 +1946,8 @@ struct drm_i915_file_private { #define IS_HSW_EARLY_SDV(dev) (IS_HASWELL(dev) && \ ((dev)->pdev->device & 0xFF00) == 0x0C00) #define IS_BDW_ULT(dev) (IS_BROADWELL(dev) && \ - (((dev)->pdev->device & 0xf) == 0x2 || \ - ((dev)->pdev->device & 0xf) == 0x6 || \ + (((dev)->pdev->device & 0xf) == 0x6 || \ + ((dev)->pdev->device & 0xf) == 0xb || \ ((dev)->pdev->device & 0xf) == 0xe)) #define IS_HSW_ULT(dev) (IS_HASWELL(dev) && \ ((dev)->pdev->device & 0xFF00) == 0x0A00) |