| Message ID | 1483473860-17644-2-git-send-email-paulo.r.zanoni@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Tue, 2017-01-03 at 18:04 -0200, Paulo Zanoni wrote: > Commit 8d9c20e1d1e3 ("drm/i915: Remove .is_mobile field from platform > struct") removed mobile vs desktop differences for HSW+, but forgot > the Broadwell reserved IDs, so do it now. > > It's interesting to notice that these IDs are used by early-quirks.c > but are *not* used by i915_pci.c. > > Cc: Carlos Santa <carlos.santa@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > include/drm/i915_pciids.h | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index ae97551..14f0cae 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -226,21 +226,18 @@ > INTEL_VGA_DEVICE(0x162A, info), /* Server */ \ > INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ > > -#define INTEL_BDW_RSVDM_IDS(info) \ > +#define INTEL_BDW_RSVD_IDS(info) \ > INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \ > INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \ > INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \ > - INTEL_VGA_DEVICE(0x163E, info) /* ULX */ > - > -#define INTEL_BDW_RSVDD_IDS(info) \ > + INTEL_VGA_DEVICE(0x163E, info), /* ULX */ \ > INTEL_VGA_DEVICE(0x163A, info), /* Server */ \ > INTEL_VGA_DEVICE(0x163D, info) /* Workstation */ > > #define INTEL_BDW_IDS(info) \ > INTEL_BDW_GT12_IDS(info), \ > INTEL_BDW_GT3_IDS(info), \ > - INTEL_BDW_RSVDM_IDS(info), \ > - INTEL_BDW_RSVDD_IDS(info) > + INTEL_BDW_RSVD_IDS(info) > > #define INTEL_CHV_IDS(info) \ > INTEL_VGA_DEVICE(0x22b0, info), \
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index ae97551..14f0cae 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -226,21 +226,18 @@ INTEL_VGA_DEVICE(0x162A, info), /* Server */ \ INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ -#define INTEL_BDW_RSVDM_IDS(info) \ +#define INTEL_BDW_RSVD_IDS(info) \ INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \ INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \ INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \ - INTEL_VGA_DEVICE(0x163E, info) /* ULX */ - -#define INTEL_BDW_RSVDD_IDS(info) \ + INTEL_VGA_DEVICE(0x163E, info), /* ULX */ \ INTEL_VGA_DEVICE(0x163A, info), /* Server */ \ INTEL_VGA_DEVICE(0x163D, info) /* Workstation */ #define INTEL_BDW_IDS(info) \ INTEL_BDW_GT12_IDS(info), \ INTEL_BDW_GT3_IDS(info), \ - INTEL_BDW_RSVDM_IDS(info), \ - INTEL_BDW_RSVDD_IDS(info) + INTEL_BDW_RSVD_IDS(info) #define INTEL_CHV_IDS(info) \ INTEL_VGA_DEVICE(0x22b0, info), \
Commit 8d9c20e1d1e3 ("drm/i915: Remove .is_mobile field from platform struct") removed mobile vs desktop differences for HSW+, but forgot the Broadwell reserved IDs, so do it now. It's interesting to notice that these IDs are used by early-quirks.c but are *not* used by i915_pci.c. Cc: Carlos Santa <carlos.santa@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- include/drm/i915_pciids.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)