[Mesa-dev] [PATCH 2/2] i965/skl: PCI ID cleanup and brand strings

[Ben Widawsky]

On Fri, Oct 23, 2015 at 01:44:38PM -0400, Ilia Mirkin wrote:
> On Fri, Oct 23, 2015 at 1:37 PM, Ben Widawsky
> <benjamin.widawsky at intel.com> wrote:
> > A few new PCI ids are added here, and one is removed (0x190B) because it no
> > longer seems to exist anywhere.
> >
> > Signed-off-by: Ben Widawsky <benjamin.widawsky at intel.com>
> > ---
> >  include/pci_ids/i965_pci_ids.h | 40 ++++++++++++++++++++++------------------
> >  1 file changed, 22 insertions(+), 18 deletions(-)
> >
> > diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
> > index 7d23547..a561f70 100644
> > --- a/include/pci_ids/i965_pci_ids.h
> > +++ b/include/pci_ids/i965_pci_ids.h
> > @@ -109,24 +109,28 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 (Broadwell GT3e)")
> >  CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)")
> >  CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3")
> >  CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
> > -CHIPSET(0x1902, skl_gt1, "Intel(R) Skylake DT  GT1")
> > -CHIPSET(0x1906, skl_gt1, "Intel(R) Skylake ULT GT1")
> > -CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake SRV GT1")
> > -CHIPSET(0x190B, skl_gt1, "Intel(R) Skylake Halo GT1")
> > -CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake ULX GT1")
> > -CHIPSET(0x1912, skl_gt2, "Intel(R) Skylake DT  GT2")
> > -CHIPSET(0x1916, skl_gt2, "Intel(R) Skylake ULT GT2")
> > -CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake SRV GT2")
> > -CHIPSET(0x191B, skl_gt2, "Intel(R) Skylake Halo GT2")
> > -CHIPSET(0x191D, skl_gt2, "Intel(R) Skylake WKS GT2")
> > -CHIPSET(0x191E, skl_gt2, "Intel(R) Skylake ULX GT2")
> > -CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake ULT GT2F")
> > -CHIPSET(0x1926, skl_gt3, "Intel(R) Skylake ULT GT3")
> > -CHIPSET(0x192B, skl_gt3, "Intel(R) Skylake Halo GT3")
> > -CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
> > -CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
> > -CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
> > -CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
> > +CHIPSET(0x1902, skl_gt1, "Intel® HD Graphics 510 (Skylake GT1)")
> 
> Are you sure you want to include non-ascii characters here? For
> example your patch encodes this as UTF-8 and displays like this on my
> term:
> 
> +CHIPSET(0x1902, skl_gt1, "Intel® HD Graphics 510 (Skylake GT1)")
> 
> I think (R) and (tm) are the accepted strings to use in these
> scenarios... [you could also have some huge complex thing to localize
> to the current LC setting, but... seems like overkill.]
> 
>   -ilia

I thought I would give it a shot, but I figured someone would complain (and I'm
not surprised it was you)... I copied all of these directly from libreoffice
opening a .xlsx, so it could very well just be wrong as opposed to a
misinterpretation.

I would prefer to switch away from ascii, but the fact that anyone said anything
means I will just switch it over.

> 
> > +CHIPSET(0x1906, skl_gt1, "Intel® HD Graphics 510 (Skylake GT1)")
> > +CHIPSET(0x190A, skl_gt1, "Intel® Skylake GT1")
> > +CHIPSET(0x190E, skl_gt1, "Intel® Skylake GT1")
> > +CHIPSET(0x1912, skl_gt2, "Intel® HD Graphics 530 (Skylake GT2)")
> > +CHIPSET(0x1913, skl_gt2, "Intel® Skylake GT2f")
> > +CHIPSET(0x1915, skl_gt2, "Intel® Skylake GT2f")
> > +CHIPSET(0x1916, skl_gt2, "Intel® HD Graphics 520 (Skylake GT2)")
> > +CHIPSET(0x1917, skl_gt2, "Intel® Skylake GT2f")
> > +CHIPSET(0x191A, skl_gt2, "Intel® Skylake GT2")
> > +CHIPSET(0x191B, skl_gt2, "Intel® HD Graphics 530 (Skylake GT2)")
> > +CHIPSET(0x191D, skl_gt2, "Intel® HD Graphics P530 (Skylake GT2)")
> > +CHIPSET(0x191E, skl_gt2, "Intel® HD Graphics 515 (Skylake GT2)")
> > +CHIPSET(0x1921, skl_gt2, "Intel® Skylake GT2f")
> > +CHIPSET(0x1923, skl_gt3, "Intel® Iris™ Graphics 540 (Skylake GT3e)")
> > +CHIPSET(0x1926, skl_gt3, "Intel® HD Graphics 535 (Skylake GT3)")
> > +CHIPSET(0x1927, skl_gt3, "Intel® Iris™ Graphics 550 (Skylake GT3e)")
> > +CHIPSET(0x192B, skl_gt3, "Iris™ Graphics Iris™ Graphics (Skylake GT3fe)")

I just noticed this bug which I copied blindly. I'll fix this too

> > +CHIPSET(0x1932, skl_gt4, "Intel® Iris™ Pro Graphics 570/580 (Skylake GT4)")
> > +CHIPSET(0x193A, skl_gt4, "Intel® Iris™ Pro Graphics P580 (Skylake GT4)")
> > +CHIPSET(0x193B, skl_gt4, "Intel® Iris™ Pro Graphics 580 (Skylake GT4)")
> > +CHIPSET(0x193D, skl_gt4, "Intel® Iris™ Pro Graphics P580 (Skylake GT4)")
> >  CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherryview)")
> >  CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics (Cherryview)")
> >  CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
> > --
> > 2.6.1
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev

-- 
Ben Widawsky, Intel Open Source Technology Center