diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-12-03 06:01:44 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-12-03 06:01:44 +0300 |
| commit | 46fe37b98ed8f67e3d68177eefe076fdaff643a2 (patch) | |
| tree | 5233e024adf6073589b38604f84c6ff33e937282 /include/drm | |
| parent | 22f8c80566c4a29a0d8b5ebf24aa1fd1679b39e5 (diff) | |
| parent | b3bf99daaee96a141536ce5c60a0d6dba6ec1d23 (diff) | |
| download | linux-46fe37b98ed8f67e3d68177eefe076fdaff643a2.tar.xz | |
Merge tag 'drm-intel-next-queued-2020-11-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
drm/i915 features for v5.11:
Highlights:
- Enable big joiner to join two pipes to one port to overcome pipe restrictions
(Manasi, Ville, Maarten)
Display:
- More DG1 enabling (Lucas, Aditya)
- Fixes to cases without display (Lucas, José, Jani)
- Initial PSR state improvements (José)
- JSL eDP vswing updates (Tejas)
- Handle EDID declared max 16 bpc (Ville)
- Display refactoring (Ville)
Other:
- GVT features
- Backmerge
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87czzzkk1s.fsf@intel.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/i915_pciids.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 3b5ed1e4f3ec..931e46191047 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -584,20 +584,19 @@ /* EHL */ #define INTEL_EHL_IDS(info) \ - INTEL_VGA_DEVICE(0x4500, info), \ - INTEL_VGA_DEVICE(0x4571, info), \ - INTEL_VGA_DEVICE(0x4551, info), \ INTEL_VGA_DEVICE(0x4541, info), \ + INTEL_VGA_DEVICE(0x4551, info), \ + INTEL_VGA_DEVICE(0x4555, info), \ INTEL_VGA_DEVICE(0x4557, info), \ - INTEL_VGA_DEVICE(0x4555, info) + INTEL_VGA_DEVICE(0x4571, info) /* JSL */ #define INTEL_JSL_IDS(info) \ - INTEL_VGA_DEVICE(0x4E71, info), \ - INTEL_VGA_DEVICE(0x4E61, info), \ - INTEL_VGA_DEVICE(0x4E57, info), \ + INTEL_VGA_DEVICE(0x4E51, info), \ INTEL_VGA_DEVICE(0x4E55, info), \ - INTEL_VGA_DEVICE(0x4E51, info) + INTEL_VGA_DEVICE(0x4E57, info), \ + INTEL_VGA_DEVICE(0x4E61, info), \ + INTEL_VGA_DEVICE(0x4E71, info) /* TGL */ #define INTEL_TGL_12_GT1_IDS(info) \ |