diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-09 10:58:30 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 10:58:30 +0100 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /include/drm/i915_pciids.h | |
| parent | Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.0-rc3 (diff) | |
| download | linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.tar.xz linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.zip | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'include/drm/i915_pciids.h')
| -rw-r--r-- | include/drm/i915_pciids.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 38a7c8049e47..f2e47fd56751 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -214,9 +214,9 @@ INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info) #define _INTEL_BDW_M_IDS(gt, info) \ - _INTEL_BDW_M(gt, 0x1602, info), /* ULT */ \ + _INTEL_BDW_M(gt, 0x1602, info), /* Halo */ \ _INTEL_BDW_M(gt, 0x1606, info), /* ULT */ \ - _INTEL_BDW_M(gt, 0x160B, info), /* Iris */ \ + _INTEL_BDW_M(gt, 0x160B, info), /* ULT */ \ _INTEL_BDW_M(gt, 0x160E, info) /* ULX */ #define _INTEL_BDW_D_IDS(gt, info) \ |