diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:43 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:43 -0800 |
| commit | ae00c6637cfe613a17953beb99c181360ff379d6 (patch) | |
| tree | 7729f1e4bb7e49f2752a41ab6dedf8d12ccd16f4 /include | |
| parent | 2b5f745c18b850734e1bb7b7e86510ea69698c71 (diff) | |
| parent | 80dfdeb75028084f42a81a4151a986c56aeec1c1 (diff) | |
Merge remote-tracking branch 'drm-intel/drm-intel-next' into drm-tip
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_crtc.h | 2 | ||||
| -rw-r--r-- | include/drm/i915_pciids.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 13eeba2a750a..4d01b4d89775 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1135,14 +1135,12 @@ struct drm_crtc { */ spinlock_t commit_lock; -#ifdef CONFIG_DEBUG_FS /** * @debugfs_entry: * * Debugfs directory for this CRTC. */ struct dentry *debugfs_entry; -#endif /** * @crc: diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index baf3d1d3d566..533890dc9da1 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -666,6 +666,12 @@ INTEL_VGA_DEVICE(0x46C2, info), \ INTEL_VGA_DEVICE(0x46C3, info) +/* ADL-N */ +#define INTEL_ADLN_IDS(info) \ + INTEL_VGA_DEVICE(0x46D0, info), \ + INTEL_VGA_DEVICE(0x46D1, info), \ + INTEL_VGA_DEVICE(0x46D2, info) + /* RPL-S */ #define INTEL_RPLS_IDS(info) \ INTEL_VGA_DEVICE(0xA780, info), \ |