Merge branch 'master' into 'main'

modesetting: match against Multimedia Video Controllers as well

See merge request xorg/xserver!1204
This commit is contained in:
Chang Liu 2026-06-02 03:13:40 +00:00
commit d15d53ae84

View file

@ -100,6 +100,9 @@ static const struct pci_id_match ms_device_match[] = {
{
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
0x00030000, 0x00ff0000, 0},
{
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
0x00040000, 0x00ff0000, 0},
{0, 0, 0},
};