diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-05-07 00:56:03 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-07 00:56:03 +0200 |
| commit | 508200c5c076b20436a04cb264168095fe1b1f1a (patch) | |
| tree | aa28dfc18ee585b46933ef0622590c6a7cb0a232 /include | |
| parent | Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/li... (diff) | |
| parent | drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX (diff) | |
| download | linux-508200c5c076b20436a04cb264168095fe1b1f1a.tar.xz linux-508200c5c076b20436a04cb264168095fe1b1f1a.zip | |
Merge tag 'topc/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Some more i915 fixes. There's still some DP issues we are looking into,
but wanted to get these moving.
* tag 'topc/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel:
drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX
drm/i915: Sanitize the enable_ppgtt module option once
drm/i915: Break encoder->crtc link separately in intel_sanitize_crtc()
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 940ece4934ba..012d58fa8ff0 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -191,8 +191,8 @@ INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \ INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \ INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \ - INTEL_VGA_DEVICE(0x0A0E, info), /* ULT GT1 reserved */ \ - INTEL_VGA_DEVICE(0x0A1E, info), /* ULT GT2 reserved */ \ + INTEL_VGA_DEVICE(0x0A0E, info), /* ULX GT1 mobile */ \ + INTEL_VGA_DEVICE(0x0A1E, info), /* ULX GT2 mobile */ \ INTEL_VGA_DEVICE(0x0A2E, info), /* ULT GT3 reserved */ \ INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \ INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \ |