diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-06-27 15:04:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-27 15:04:06 +1000 |
| commit | 0fcb70c30131aac40f62ba13f89963d5c13b48a7 (patch) | |
| tree | 326d3f748dcb8f5aa15408b4a2138c6d3e403f47 /include | |
| parent | b5f4843c67843588c5ebbe374f586a509bbe237d (diff) | |
| parent | 8525a235c96a548873c6c5644f50df32b31f04c6 (diff) | |
| download | linux-0fcb70c30131aac40f62ba13f89963d5c13b48a7.tar.gz linux-0fcb70c30131aac40f62ba13f89963d5c13b48a7.tar.bz2 linux-0fcb70c30131aac40f62ba13f89963d5c13b48a7.zip | |
Merge tag 'drm-intel-fixes-2014-06-26' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Fixes for 3.16-rc2; regressions, races, and warns; Broadwell PCI IDs.
* tag 'drm-intel-fixes-2014-06-26' of git://anongit.freedesktop.org/drm-intel:
drm/i915: vlv_prepare_pll is only needed in case of non DSI interfaces
drm/i915: Hold the table lock whilst walking the file's idr and counting the objects in debugfs
drm/i915: BDW: Adding Reserved PCI IDs.
drm/i915: Only mark the ctx as initialised after a SET_CONTEXT operation
drm/i915: default to having backlight if VBT not available
drm/i915: cache hw power well enabled state
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/i915_pciids.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 0572035673f3..a70d45647898 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -237,13 +237,21 @@ #define INTEL_BDW_GT3D_IDS(info) \ _INTEL_BDW_D_IDS(3, info) +#define INTEL_BDW_RSVDM_IDS(info) \ + _INTEL_BDW_M_IDS(4, info) + +#define INTEL_BDW_RSVDD_IDS(info) \ + _INTEL_BDW_D_IDS(4, info) + #define INTEL_BDW_M_IDS(info) \ INTEL_BDW_GT12M_IDS(info), \ - INTEL_BDW_GT3M_IDS(info) + INTEL_BDW_GT3M_IDS(info), \ + INTEL_BDW_RSVDM_IDS(info) #define INTEL_BDW_D_IDS(info) \ INTEL_BDW_GT12D_IDS(info), \ - INTEL_BDW_GT3D_IDS(info) + INTEL_BDW_GT3D_IDS(info), \ + INTEL_BDW_RSVDD_IDS(info) #define INTEL_CHV_IDS(info) \ INTEL_VGA_DEVICE(0x22b0, info), \ |