diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-02-27 10:30:07 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-02-27 10:30:07 +1000 |
| commit | d1e488fda8ffe78d6dfc69b7e5f03fdf46f3a334 (patch) | |
| tree | 59bd94531d32dd05cac8f0a9b73ecb6dea4fc2c5 /include | |
| parent | a795e4e9dd9310e5a862b3e478eb9cb55b14213e (diff) | |
| parent | 62e537f8d568347bbe4e00d7803a838750cdc618 (diff) | |
Merge tag 'drm-intel-fixes-2015-02-26' of git://anongit.freedesktop.org/drm-intel into drm-fixes
First batch of fixes for v4.0-rc, plenty of cc: stable material.
* tag 'drm-intel-fixes-2015-02-26' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Fix frontbuffer false positve.
drm/i915: Align initial plane backing objects correctly
drm/i915: avoid processing spurious/shared interrupts in low-power states
drm/i915: Check obj->vma_list under the struct_mutex
drm/i915: Fix a use after free, and unbalanced refcounting
drm/i915: Dell Chromebook 11 has PWM backlight
drm/i915/skl: handle all pixel formats in skylake_update_primary_plane()
drm/i915/bdw: PCI IDs ending in 0xb are ULT.
Diffstat (limited to 'include')
| -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 180ad0e6de21..d016dc57f007 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) \ |