| Message ID | 20190322203520.12596-1-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [libdrm] intel: sync i915_pciids.h with kernel | expand |
On Fri, 2019-03-22 at 13:35 -0700, Anusha wrote: > Straight copy from the kernel file. > > Add PCI IDs for CML, add additional PCI ID > for ICL. > > Align with kernel commits: > > a7b4deeb02b97 ("drm/i915/cml: Add CML PCI IDS") > 9a751b999d17a ("drm/i915: Add new ICL PCI ID") > > v2: Do a copy from kernel header (Jose) > - Change commit message (Lucas) > > v3: Add corresponding kernel commit IDs (Antonio) Not sure if libdrm have a style rule but in i915 we use 12 digits for the commit hash, other than that: Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Cc: Antonio Argenziano <antonio.argenziano@intel.com> > Cc: José Roberto de Souza <jose.souza@intel.com> > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > --- > intel/i915_pciids.h | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > > diff --git a/intel/i915_pciids.h b/intel/i915_pciids.h > index d2fad7b0..291b5e3f 100644 > --- a/intel/i915_pciids.h > +++ b/intel/i915_pciids.h > @@ -373,6 +373,30 @@ > #define INTEL_AML_CFL_GT2_IDS(info) \ > INTEL_VGA_DEVICE(0x87CA, info) > > +/* CML GT1 */ > +#define INTEL_CML_GT1_IDS(info) \ > + INTEL_VGA_DEVICE(0x9B21, info), \ > + INTEL_VGA_DEVICE(0x9BAA, info), \ > + INTEL_VGA_DEVICE(0x9BAB, info), \ > + INTEL_VGA_DEVICE(0x9BAC, info), \ > + INTEL_VGA_DEVICE(0x9BA0, info), \ > + INTEL_VGA_DEVICE(0x9BA5, info), \ > + INTEL_VGA_DEVICE(0x9BA8, info), \ > + INTEL_VGA_DEVICE(0x9BA4, info), \ > + INTEL_VGA_DEVICE(0x9BA2, info) > + > +/* CML GT2 */ > +#define INTEL_CML_GT2_IDS(info) \ > + INTEL_VGA_DEVICE(0x9B41, info), \ > + INTEL_VGA_DEVICE(0x9BCA, info), \ > + INTEL_VGA_DEVICE(0x9BCB, info), \ > + INTEL_VGA_DEVICE(0x9BCC, info), \ > + INTEL_VGA_DEVICE(0x9BC0, info), \ > + INTEL_VGA_DEVICE(0x9BC5, info), \ > + INTEL_VGA_DEVICE(0x9BC8, info), \ > + INTEL_VGA_DEVICE(0x9BC4, info), \ > + INTEL_VGA_DEVICE(0x9BC2, info) > + > #define INTEL_KBL_IDS(info) \ > INTEL_KBL_GT1_IDS(info), \ > INTEL_KBL_GT2_IDS(info), \ > @@ -436,7 +460,9 @@ > INTEL_WHL_U_GT1_IDS(info), \ > INTEL_WHL_U_GT2_IDS(info), \ > INTEL_WHL_U_GT3_IDS(info), \ > - INTEL_AML_CFL_GT2_IDS(info) > + INTEL_AML_CFL_GT2_IDS(info), \ > + INTEL_CML_GT1_IDS(info), \ > + INTEL_CML_GT2_IDS(info) > > /* CNL */ > #define INTEL_CNL_IDS(info) \ > @@ -469,6 +495,7 @@ > INTEL_VGA_DEVICE(0x8A57, info), \ > INTEL_VGA_DEVICE(0x8A56, info), \ > INTEL_VGA_DEVICE(0x8A71, info), \ > - INTEL_VGA_DEVICE(0x8A70, info) > + INTEL_VGA_DEVICE(0x8A70, info), \ > + INTEL_VGA_DEVICE(0x8A53, info) > > #endif /* _I915_PCIIDS_H */
On Fri, 22 Mar 2019, "Souza, Jose" <jose.souza@intel.com> wrote: > On Fri, 2019-03-22 at 13:35 -0700, Anusha wrote: >> Straight copy from the kernel file. >> >> Add PCI IDs for CML, add additional PCI ID >> for ICL. >> >> Align with kernel commits: >> >> a7b4deeb02b97 ("drm/i915/cml: Add CML PCI IDS") >> 9a751b999d17a ("drm/i915: Add new ICL PCI ID") >> >> v2: Do a copy from kernel header (Jose) >> - Change commit message (Lucas) >> >> v3: Add corresponding kernel commit IDs (Antonio) > > Not sure if libdrm have a style rule but in i915 we use 12 digits for > the commit hash, other than that: Protip, 'dim cite' gives you the references in the right format, or you can add this to your .gitconfig alias section for a 'git cite' alias: cite = "!f() { git log -1 '--pretty=format:%H (\"%s\")%n' $1 | sed -e 's/\\([0-f]\\{12\\}\\)[0-f]*/\\1/'; }; f" BR, Jani. > > Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > >> >> Cc: Antonio Argenziano <antonio.argenziano@intel.com> >> Cc: José Roberto de Souza <jose.souza@intel.com> >> Cc: Lucas De Marchi <lucas.demarchi@intel.com> >> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >> --- >> intel/i915_pciids.h | 31 +++++++++++++++++++++++++++++-- >> 1 file changed, 29 insertions(+), 2 deletions(-) >> >> diff --git a/intel/i915_pciids.h b/intel/i915_pciids.h >> index d2fad7b0..291b5e3f 100644 >> --- a/intel/i915_pciids.h >> +++ b/intel/i915_pciids.h >> @@ -373,6 +373,30 @@ >> #define INTEL_AML_CFL_GT2_IDS(info) \ >> INTEL_VGA_DEVICE(0x87CA, info) >> >> +/* CML GT1 */ >> +#define INTEL_CML_GT1_IDS(info) \ >> + INTEL_VGA_DEVICE(0x9B21, info), \ >> + INTEL_VGA_DEVICE(0x9BAA, info), \ >> + INTEL_VGA_DEVICE(0x9BAB, info), \ >> + INTEL_VGA_DEVICE(0x9BAC, info), \ >> + INTEL_VGA_DEVICE(0x9BA0, info), \ >> + INTEL_VGA_DEVICE(0x9BA5, info), \ >> + INTEL_VGA_DEVICE(0x9BA8, info), \ >> + INTEL_VGA_DEVICE(0x9BA4, info), \ >> + INTEL_VGA_DEVICE(0x9BA2, info) >> + >> +/* CML GT2 */ >> +#define INTEL_CML_GT2_IDS(info) \ >> + INTEL_VGA_DEVICE(0x9B41, info), \ >> + INTEL_VGA_DEVICE(0x9BCA, info), \ >> + INTEL_VGA_DEVICE(0x9BCB, info), \ >> + INTEL_VGA_DEVICE(0x9BCC, info), \ >> + INTEL_VGA_DEVICE(0x9BC0, info), \ >> + INTEL_VGA_DEVICE(0x9BC5, info), \ >> + INTEL_VGA_DEVICE(0x9BC8, info), \ >> + INTEL_VGA_DEVICE(0x9BC4, info), \ >> + INTEL_VGA_DEVICE(0x9BC2, info) >> + >> #define INTEL_KBL_IDS(info) \ >> INTEL_KBL_GT1_IDS(info), \ >> INTEL_KBL_GT2_IDS(info), \ >> @@ -436,7 +460,9 @@ >> INTEL_WHL_U_GT1_IDS(info), \ >> INTEL_WHL_U_GT2_IDS(info), \ >> INTEL_WHL_U_GT3_IDS(info), \ >> - INTEL_AML_CFL_GT2_IDS(info) >> + INTEL_AML_CFL_GT2_IDS(info), \ >> + INTEL_CML_GT1_IDS(info), \ >> + INTEL_CML_GT2_IDS(info) >> >> /* CNL */ >> #define INTEL_CNL_IDS(info) \ >> @@ -469,6 +495,7 @@ >> INTEL_VGA_DEVICE(0x8A57, info), \ >> INTEL_VGA_DEVICE(0x8A56, info), \ >> INTEL_VGA_DEVICE(0x8A71, info), \ >> - INTEL_VGA_DEVICE(0x8A70, info) >> + INTEL_VGA_DEVICE(0x8A70, info), \ >> + INTEL_VGA_DEVICE(0x8A53, info) >> >> #endif /* _I915_PCIIDS_H */ > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/intel/i915_pciids.h b/intel/i915_pciids.h index d2fad7b0..291b5e3f 100644 --- a/intel/i915_pciids.h +++ b/intel/i915_pciids.h @@ -373,6 +373,30 @@ #define INTEL_AML_CFL_GT2_IDS(info) \ INTEL_VGA_DEVICE(0x87CA, info) +/* CML GT1 */ +#define INTEL_CML_GT1_IDS(info) \ + INTEL_VGA_DEVICE(0x9B21, info), \ + INTEL_VGA_DEVICE(0x9BAA, info), \ + INTEL_VGA_DEVICE(0x9BAB, info), \ + INTEL_VGA_DEVICE(0x9BAC, info), \ + INTEL_VGA_DEVICE(0x9BA0, info), \ + INTEL_VGA_DEVICE(0x9BA5, info), \ + INTEL_VGA_DEVICE(0x9BA8, info), \ + INTEL_VGA_DEVICE(0x9BA4, info), \ + INTEL_VGA_DEVICE(0x9BA2, info) + +/* CML GT2 */ +#define INTEL_CML_GT2_IDS(info) \ + INTEL_VGA_DEVICE(0x9B41, info), \ + INTEL_VGA_DEVICE(0x9BCA, info), \ + INTEL_VGA_DEVICE(0x9BCB, info), \ + INTEL_VGA_DEVICE(0x9BCC, info), \ + INTEL_VGA_DEVICE(0x9BC0, info), \ + INTEL_VGA_DEVICE(0x9BC5, info), \ + INTEL_VGA_DEVICE(0x9BC8, info), \ + INTEL_VGA_DEVICE(0x9BC4, info), \ + INTEL_VGA_DEVICE(0x9BC2, info) + #define INTEL_KBL_IDS(info) \ INTEL_KBL_GT1_IDS(info), \ INTEL_KBL_GT2_IDS(info), \ @@ -436,7 +460,9 @@ INTEL_WHL_U_GT1_IDS(info), \ INTEL_WHL_U_GT2_IDS(info), \ INTEL_WHL_U_GT3_IDS(info), \ - INTEL_AML_CFL_GT2_IDS(info) + INTEL_AML_CFL_GT2_IDS(info), \ + INTEL_CML_GT1_IDS(info), \ + INTEL_CML_GT2_IDS(info) /* CNL */ #define INTEL_CNL_IDS(info) \ @@ -469,6 +495,7 @@ INTEL_VGA_DEVICE(0x8A57, info), \ INTEL_VGA_DEVICE(0x8A56, info), \ INTEL_VGA_DEVICE(0x8A71, info), \ - INTEL_VGA_DEVICE(0x8A70, info) + INTEL_VGA_DEVICE(0x8A70, info), \ + INTEL_VGA_DEVICE(0x8A53, info) #endif /* _I915_PCIIDS_H */
Straight copy from the kernel file. Add PCI IDs for CML, add additional PCI ID for ICL. Align with kernel commits: a7b4deeb02b97 ("drm/i915/cml: Add CML PCI IDS") 9a751b999d17a ("drm/i915: Add new ICL PCI ID") v2: Do a copy from kernel header (Jose) - Change commit message (Lucas) v3: Add corresponding kernel commit IDs (Antonio) Cc: Antonio Argenziano <antonio.argenziano@intel.com> Cc: José Roberto de Souza <jose.souza@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> --- intel/i915_pciids.h | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)