| Message ID | 20180614220832.22677-2-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 14, 2018 at 03:08:32PM -0700, José Roberto de Souza wrote: > Amber Lake uses the same gen graphics as Kaby Lake, including a id > that were previously marked as reserved on Kaby Lake, but that > now is moved to AML page. > > So, let's just move it to AML macro that will feed into KBL macro > just to keep it better organized to make easier future code review > but it will be handled as a KBL. > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/i915_pci.c | 1 + > include/drm/i915_pciids.h | 9 +++++++-- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 92e98773e53d..55543f1b0236 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -657,6 +657,7 @@ static const struct pci_device_id pciidlist[] = { > INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), > INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), > INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), > + INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info), > INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), > INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), > INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index 3de071588d6a..31f12e74e112 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -349,7 +349,6 @@ > #define INTEL_KBL_GT2_IDS(info) \ > INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ > INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \ > - INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \ > INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \ > INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ > INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ > @@ -365,11 +364,17 @@ > #define INTEL_KBL_GT4_IDS(info) \ > INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ > > +/* AML/KBL Y GT2 */ > +#define INTEL_AML_GT2_IDS(info) \ > + INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \ > + INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */ > + > #define INTEL_KBL_IDS(info) \ > INTEL_KBL_GT1_IDS(info), \ > INTEL_KBL_GT2_IDS(info), \ > INTEL_KBL_GT3_IDS(info), \ > - INTEL_KBL_GT4_IDS(info) > + INTEL_KBL_GT4_IDS(info), \ > + INTEL_AML_GT2_IDS(info) > > /* CFL S */ > #define INTEL_CFL_S_GT1_IDS(info) \ > -- > 2.17.1 >
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 92e98773e53d..55543f1b0236 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -657,6 +657,7 @@ static const struct pci_device_id pciidlist[] = { INTEL_KBL_GT2_IDS(&intel_kabylake_gt2_info), INTEL_KBL_GT3_IDS(&intel_kabylake_gt3_info), INTEL_KBL_GT4_IDS(&intel_kabylake_gt3_info), + INTEL_AML_GT2_IDS(&intel_kabylake_gt2_info), INTEL_CFL_S_GT1_IDS(&intel_coffeelake_gt1_info), INTEL_CFL_S_GT2_IDS(&intel_coffeelake_gt2_info), INTEL_CFL_H_GT2_IDS(&intel_coffeelake_gt2_info), diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 3de071588d6a..31f12e74e112 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -349,7 +349,6 @@ #define INTEL_KBL_GT2_IDS(info) \ INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \ INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \ - INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \ @@ -365,11 +364,17 @@ #define INTEL_KBL_GT4_IDS(info) \ INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */ +/* AML/KBL Y GT2 */ +#define INTEL_AML_GT2_IDS(info) \ + INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \ + INTEL_VGA_DEVICE(0x87C0, info) /* ULX GT2 */ + #define INTEL_KBL_IDS(info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ INTEL_KBL_GT3_IDS(info), \ - INTEL_KBL_GT4_IDS(info) + INTEL_KBL_GT4_IDS(info), \ + INTEL_AML_GT2_IDS(info) /* CFL S */ #define INTEL_CFL_S_GT1_IDS(info) \
Amber Lake uses the same gen graphics as Kaby Lake, including a id that were previously marked as reserved on Kaby Lake, but that now is moved to AML page. So, let's just move it to AML macro that will feed into KBL macro just to keep it better organized to make easier future code review but it will be handled as a KBL. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- drivers/gpu/drm/i915/i915_pci.c | 1 + include/drm/i915_pciids.h | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-)