Message ID | 1446060072-19489-1-git-send-email-rodrigo.vivi@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, 28 Oct 2015, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > From: Deepak S <deepak.s@intel.com> > > v2: (Rodrigo) Rebase after commit 3cb27f38f > ("drm/i915: remove an extra level of indirection in PCI ID list") > > Cc: Jani Nikula <jani.nikula@intel.com> > Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> > Signed-off-by: Deepak S <deepak.s@intel.com> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Pushed patches 1-4, thanks. BR, Jani. > --- > drivers/gpu/drm/i915/i915_drv.c | 1 + > include/drm/i915_pciids.h | 9 ++++++++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index f020daa..9f55209 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -469,6 +469,7 @@ static const struct pci_device_id pciidlist[] = { > INTEL_KBL_GT1_IDS(&intel_kabylake_info), > INTEL_KBL_GT2_IDS(&intel_kabylake_info), > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), > + INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), > {0, 0, 0} > }; > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index 2e7a159..f1a113e 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -315,9 +315,16 @@ > INTEL_VGA_DEVICE(0x592B, info), /* Halo GT3 */ \ > INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ > > +#define INTEL_KBL_GT4_IDS(info) \ > + INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \ > + INTEL_VGA_DEVICE(0x593B, info), /* Halo GT4 */ \ > + INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \ > + INTEL_VGA_DEVICE(0x593D, info) /* WKS GT4 */ > + > #define INTEL_KBL_IDS(info) \ > INTEL_KBL_GT1_IDS(info), \ > INTEL_KBL_GT2_IDS(info), \ > - INTEL_KBL_GT3_IDS(info) > + INTEL_KBL_GT3_IDS(info), \ > + INTEL_KBL_GT4_IDS(info) > > #endif /* _I915_PCIIDS_H */ > -- > 2.4.3 >
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f020daa..9f55209 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -469,6 +469,7 @@ static const struct pci_device_id pciidlist[] = { INTEL_KBL_GT1_IDS(&intel_kabylake_info), INTEL_KBL_GT2_IDS(&intel_kabylake_info), INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), + INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), {0, 0, 0} }; diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 2e7a159..f1a113e 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -315,9 +315,16 @@ INTEL_VGA_DEVICE(0x592B, info), /* Halo GT3 */ \ INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */ +#define INTEL_KBL_GT4_IDS(info) \ + INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \ + INTEL_VGA_DEVICE(0x593B, info), /* Halo GT4 */ \ + INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \ + INTEL_VGA_DEVICE(0x593D, info) /* WKS GT4 */ + #define INTEL_KBL_IDS(info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ - INTEL_KBL_GT3_IDS(info) + INTEL_KBL_GT3_IDS(info), \ + INTEL_KBL_GT4_IDS(info) #endif /* _I915_PCIIDS_H */