xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/dri2/pci_ids/i965_pci_ids.h |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d3a26bbf618507e1ca05b2bc99a880075b77db77
Author: A. Wilcox <AWilcox at Wilcox-Tech.com>
Date:   Sat Jan 26 15:37:56 2019 -0600

    DRI2: Add another Coffeelake PCI ID
    
    A user of Adélie Linux reported that modesetting wasn't working properly on
    their Intel i7-9700K-integrated UHD 630 GPU.  Xorg.0.log showed:
    
    [   131.902] (EE) modeset(0): [DRI2] No driver mapping found for PCI device 0x8086 / 0x3e98
    [   131.902] (EE) modeset(0): Failed to initialize the DRI2 extension.
    
    Indeed, that PCI ID is missing from i965_pci_ids.  Adding it fixed the issue
    and allowed the system to work with i965_dri under modesetting.

diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
index 82e4a549e..1ef1a0edf 100644
--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
@@ -174,6 +174,7 @@ CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
 CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")