Message ID | 20200521003803.18936-13-lucas.demarchi@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Introduce DG1 | expand |
On Wed, 2020-05-20 at 17:37 -0700, Lucas De Marchi wrote: > From: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> > > Bspec: 44463 Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: James Ausmus <james.ausmus@intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Matt Roper <matthew.d.roper@intel.com> > Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/i915_pci.c | 3 ++- > include/drm/i915_pciids.h | 4 ++++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index e5a851a2dfe7..f1a3a59093c9 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -879,7 +879,7 @@ static const struct intel_device_info rkl_info = { > .has_master_unit_irq = 1, \ > .has_snoop_pcie = 1 > > -static const struct intel_device_info intel_dg1_info = { > +static const struct intel_device_info dg1_info = { > GEN12_DGFX_FEATURES, > PLATFORM(INTEL_DG1), > .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), > @@ -964,6 +964,7 @@ static const struct pci_device_id pciidlist[] = { > INTEL_EHL_IDS(&ehl_info), > INTEL_TGL_12_IDS(&tgl_info), > INTEL_RKL_IDS(&rkl_info), > + INTEL_DG1_IDS(&dg1_info), > {0, 0, 0} > }; > MODULE_DEVICE_TABLE(pci, pciidlist); > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index bc989de2aac2..f44fe822880d 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -614,4 +614,8 @@ > INTEL_VGA_DEVICE(0x4C90, info), \ > INTEL_VGA_DEVICE(0x4C9A, info) > > +/* DG1 */ > +#define INTEL_DG1_IDS(info) \ > + INTEL_VGA_DEVICE(0x4905, info) > + > #endif /* _I915_PCIIDS_H */
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index e5a851a2dfe7..f1a3a59093c9 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -879,7 +879,7 @@ static const struct intel_device_info rkl_info = { .has_master_unit_irq = 1, \ .has_snoop_pcie = 1 -static const struct intel_device_info intel_dg1_info = { +static const struct intel_device_info dg1_info = { GEN12_DGFX_FEATURES, PLATFORM(INTEL_DG1), .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), @@ -964,6 +964,7 @@ static const struct pci_device_id pciidlist[] = { INTEL_EHL_IDS(&ehl_info), INTEL_TGL_12_IDS(&tgl_info), INTEL_RKL_IDS(&rkl_info), + INTEL_DG1_IDS(&dg1_info), {0, 0, 0} }; MODULE_DEVICE_TABLE(pci, pciidlist); diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index bc989de2aac2..f44fe822880d 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -614,4 +614,8 @@ INTEL_VGA_DEVICE(0x4C90, info), \ INTEL_VGA_DEVICE(0x4C9A, info) +/* DG1 */ +#define INTEL_DG1_IDS(info) \ + INTEL_VGA_DEVICE(0x4905, info) + #endif /* _I915_PCIIDS_H */