On Mon, Aug 22, 2016 at 10:57 PM, Reid Hekman <rhekman at gmail.com> wrote:
> On 08/22/2016 08:27 PM, Michel Dänzer wrote:
>>
>> On 23/08/16 10:18 AM, Reid Hekman wrote:
>>>
>>>
>>> I was encouraged by a commit I saw today to add Sea Islands PCI ids to
>>> xf86-video-amdgpu. However I did not see MULLINS included. Are there
>>> other showstoppers preventing inclusion?
>>
>>
>> I assume the commit you're referring to was the one adding the
>> *Southern* Islands (SI) PCI IDs. Since Mullins is Sea Islands (CIK), it
>> should already be supported by the amdgpu kernel driver; its omission
>> from xf86-video-amdgpu is probably just an oversight. Can you send a
>> patch to the amd-gfx mailing list?
>>
>
> Michael, oops, yes, sorry, apparently my head was on the wrong AMD islands.
> Admittedly I'm a total newb at this, but David's script makes this seem
> fairly simple. Does the following look correct?
>
> Regards,
> Reid
>
> ---
> diff -aur a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
> --- a/src/amdgpu_chipinfo_gen.h 2016-08-22 21:25:49.101755291 -0500
> +++ b/src/amdgpu_chipinfo_gen.h 2016-08-22 21:41:26.758967344 -0500
> @@ -100,6 +100,22 @@
> { 0x983D, CHIP_FAMILY_KABINI },
> { 0x983E, CHIP_FAMILY_KABINI },
> { 0x983F, CHIP_FAMILY_KABINI },
> + { 0x9850, CHIP_FAMILY_MULLINS },
> + { 0x9851, CHIP_FAMILY_MULLINS },
> + { 0x9852, CHIP_FAMILY_MULLINS },
> + { 0x9853, CHIP_FAMILY_MULLINS },
> + { 0x9854, CHIP_FAMILY_MULLINS },
> + { 0x9855, CHIP_FAMILY_MULLINS },
> + { 0x9856, CHIP_FAMILY_MULLINS },
> + { 0x9857, CHIP_FAMILY_MULLINS },
> + { 0x9858, CHIP_FAMILY_MULLINS },
> + { 0x9859, CHIP_FAMILY_MULLINS },
> + { 0x985a, CHIP_FAMILY_MULLINS },
> + { 0x985b, CHIP_FAMILY_MULLINS },
> + { 0x985c, CHIP_FAMILY_MULLINS },
> + { 0x985d, CHIP_FAMILY_MULLINS },
> + { 0x985e, CHIP_FAMILY_MULLINS },
> + { 0x985f, CHIP_FAMILY_MULLINS },
> { 0x1304, CHIP_FAMILY_KAVERI },
> { 0x1305, CHIP_FAMILY_KAVERI },
> { 0x1306, CHIP_FAMILY_KAVERI },
> diff -aur a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
> --- a/src/amdgpu_chipset_gen.h 2016-08-22 21:25:49.101755291 -0500
> +++ b/src/amdgpu_chipset_gen.h 2016-08-22 21:41:26.758967344 -0500
> @@ -100,6 +100,22 @@
> { PCI_CHIP_KABINI_983D, "KABINI" },
> { PCI_CHIP_KABINI_983E, "KABINI" },
> { PCI_CHIP_KABINI_983F, "KABINI" },
> + { PCI_CHIP_MULLINS 9850, "MULLINS" },
> + { PCI_CHIP_MULLINS 9851, "MULLINS" },
> + { PCI_CHIP_MULLINS 9852, "MULLINS" },
> + { PCI_CHIP_MULLINS 9853, "MULLINS" },
> + { PCI_CHIP_MULLINS 9854, "MULLINS" },
> + { PCI_CHIP_MULLINS 9855, "MULLINS" },
> + { PCI_CHIP_MULLINS 9856, "MULLINS" },
> + { PCI_CHIP_MULLINS 9857, "MULLINS" },
> + { PCI_CHIP_MULLINS 9858, "MULLINS" },
> + { PCI_CHIP_MULLINS 9859, "MULLINS" },
> + { PCI_CHIP_MULLINS 985a, "MULLINS" },
> + { PCI_CHIP_MULLINS 985b, "MULLINS" },
> + { PCI_CHIP_MULLINS 985c, "MULLINS" },
> + { PCI_CHIP_MULLINS 985d, "MULLINS" },
> + { PCI_CHIP_MULLINS 985e, "MULLINS" },
> + { PCI_CHIP_MULLINS 985f, "MULLINS" },
> { PCI_CHIP_KAVERI_1304, "KAVERI" },
> { PCI_CHIP_KAVERI_1305, "KAVERI" },
> { PCI_CHIP_KAVERI_1306, "KAVERI" },
> diff -aur a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
> --- a/src/amdgpu_pci_chipset_gen.h 2016-08-22 21:25:49.104755254 -0500
> +++ b/src/amdgpu_pci_chipset_gen.h 2016-08-22 21:41:26.758967344 -0500
> @@ -100,6 +100,22 @@
> { PCI_CHIP_KABINI_983D, PCI_CHIP_KABINI_983D, RES_SHARED_VGA },
> { PCI_CHIP_KABINI_983E, PCI_CHIP_KABINI_983E, RES_SHARED_VGA },
> { PCI_CHIP_KABINI_983F, PCI_CHIP_KABINI_983F, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9850, PCI_CHIP_MULLINS 9850, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9851, PCI_CHIP_MULLINS 9851, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9852, PCI_CHIP_MULLINS 9852, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9853, PCI_CHIP_MULLINS 9853, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9854, PCI_CHIP_MULLINS 9854, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9855, PCI_CHIP_MULLINS 9855, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9856, PCI_CHIP_MULLINS 9856, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9857, PCI_CHIP_MULLINS 9857, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9858, PCI_CHIP_MULLINS 9858, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 9859, PCI_CHIP_MULLINS 9859, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 985a, PCI_CHIP_MULLINS 985a, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 985b, PCI_CHIP_MULLINS 985b, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 985c, PCI_CHIP_MULLINS 985c, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 985d, PCI_CHIP_MULLINS 985d, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 985e, PCI_CHIP_MULLINS 985e, RES_SHARED_VGA },
> + { PCI_CHIP_MULLINS 985f, PCI_CHIP_MULLINS 985f, RES_SHARED_VGA },
> { PCI_CHIP_KAVERI_1304, PCI_CHIP_KAVERI_1304, RES_SHARED_VGA },
> { PCI_CHIP_KAVERI_1305, PCI_CHIP_KAVERI_1305, RES_SHARED_VGA },
> { PCI_CHIP_KAVERI_1306, PCI_CHIP_KAVERI_1306, RES_SHARED_VGA },
> diff -aur a/src/amdgpu_pci_device_match_gen.h
> b/src/amdgpu_pci_device_match_gen.h
> --- a/src/amdgpu_pci_device_match_gen.h 2016-08-22 21:25:49.104755254 -0500
> +++ b/src/amdgpu_pci_device_match_gen.h 2016-08-22 21:41:26.758967344 -0500
> @@ -100,6 +100,22 @@
> ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983D, 0 ),
> ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983E, 0 ),
> ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983F, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9850, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9851, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9852, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9853, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9854, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9855, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9856, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9857, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9858, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 9859, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 985a, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 985b, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 985c, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 985d, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 985e, 0 ),
> + ATI_DEVICE_MATCH( PCI_CHIP_MULLINS 985f, 0 ),
> ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1304, 0 ),
> ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1305, 0 ),
> ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1306, 0 ),
> diff -aur a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
> --- a/src/ati_pciids_gen.h 2016-08-22 21:25:49.105755241 -0500
> +++ b/src/ati_pciids_gen.h 2016-08-22 21:41:26.758967344 -0500
> @@ -98,6 +98,22 @@
> #define PCI_CHIP_KABINI_983D 0x983D
> #define PCI_CHIP_KABINI_983E 0x983E
> #define PCI_CHIP_KABINI_983F 0x983F
> +#define PCI_CHIP_MULLINS 9850 0x9850
> +#define PCI_CHIP_MULLINS 9851 0x9851
> +#define PCI_CHIP_MULLINS 9852 0x9852
> +#define PCI_CHIP_MULLINS 9853 0x9853
> +#define PCI_CHIP_MULLINS 9854 0x9854
> +#define PCI_CHIP_MULLINS 9855 0x9855
> +#define PCI_CHIP_MULLINS 9856 0x9856
> +#define PCI_CHIP_MULLINS 9857 0x9857
> +#define PCI_CHIP_MULLINS 9858 0x9858
> +#define PCI_CHIP_MULLINS 9859 0x9859
> +#define PCI_CHIP_MULLINS 985a 0x985a
> +#define PCI_CHIP_MULLINS 985b 0x985b
> +#define PCI_CHIP_MULLINS 985c 0x985c
> +#define PCI_CHIP_MULLINS 985d 0x985d
> +#define PCI_CHIP_MULLINS 985e 0x985e
> +#define PCI_CHIP_MULLINS 985f 0x985f
> #define PCI_CHIP_KAVERI_1304 0x1304
> #define PCI_CHIP_KAVERI_1305 0x1305
> #define PCI_CHIP_KAVERI_1306 0x1306
> diff -aur a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
> --- a/src/pcidb/ati_pciids.csv 2016-08-22 21:25:49.106755228 -0500
> +++ b/src/pcidb/ati_pciids.csv 2016-08-22 21:41:06.639220283 -0500
> @@ -99,6 +99,22 @@
> "0x983D","KABINI_983D","KABINI","KABINI"
> "0x983E","KABINI_983E","KABINI","KABINI"
> "0x983F","KABINI_983F","KABINI","KABINI"
> +"0x9850","MULLINS 9850","MULLINS","MULLINS"
These should probably all be underscores instead of spaces... did you
try compiling these? I doubt it would have worked...
> +"0x9851","MULLINS 9851","MULLINS","MULLINS"
> +"0x9852","MULLINS 9852","MULLINS","MULLINS"
> +"0x9853","MULLINS 9853","MULLINS","MULLINS"
> +"0x9854","MULLINS 9854","MULLINS","MULLINS"
> +"0x9855","MULLINS 9855","MULLINS","MULLINS"
> +"0x9856","MULLINS 9856","MULLINS","MULLINS"
> +"0x9857","MULLINS 9857","MULLINS","MULLINS"
> +"0x9858","MULLINS 9858","MULLINS","MULLINS"
> +"0x9859","MULLINS 9859","MULLINS","MULLINS"
> +"0x985a","MULLINS 985a","MULLINS","MULLINS"
> +"0x985b","MULLINS 985b","MULLINS","MULLINS"
> +"0x985c","MULLINS 985c","MULLINS","MULLINS"
> +"0x985d","MULLINS 985d","MULLINS","MULLINS"
> +"0x985e","MULLINS 985e","MULLINS","MULLINS"
> +"0x985f","MULLINS 985f","MULLINS","MULLINS"
> "0x1304","KAVERI_1304","KAVERI","KAVERI"
> "0x1305","KAVERI_1305","KAVERI","KAVERI"
> "0x1306","KAVERI_1306","KAVERI","KAVERI"
>
> ---
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
