File 0010-drm-bochs-cirrus-i915-Fixup-missing-PCI-IDs.patch of Package drm
From c929707e6928ccd6f2626b080a7e8c79a936f942 Mon Sep 17 00:00:00 2001
From: Patrik Jakobsson <pjakobsson@suse.de>
Date: Thu, 30 Mar 2017 04:24:39 +0200
Subject: [PATCH 10/12] drm/bochs/cirrus/i915: Fixup missing PCI IDs
Signed-off-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/bochs/bochs_drv.c | 4 ++--
drivers/gpu/drm/cirrus/cirrus_drv.c | 5 ++++-
drivers/gpu/drm/i915/i915_drv.c | 6 ++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index 534227d..71be933 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -190,8 +190,8 @@ static const struct pci_device_id bochs_pci_tbl[] = {
{
.vendor = 0x1234,
.device = 0x1111,
- .subvendor = PCI_SUBVENDOR_ID_REDHAT_QUMRANET,
- .subdevice = PCI_SUBDEVICE_ID_QEMU,
+ .subvendor = /* PCI_SUBVENDOR_ID_REDHAT_QUMRANET */ 0x1af4,
+ .subdevice = /* PCI_SUBDEVICE_ID_QEMU */ 0x1100,
.driver_data = BOCHS_QEMU_STDVGA,
},
{
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index 6c76d12..365b0ab 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -34,7 +34,10 @@ static struct drm_driver driver;
/* only bind to the cirrus chip in qemu */
static const struct pci_device_id pciidlist[] = {
{ PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5446,
- PCI_SUBVENDOR_ID_REDHAT_QUMRANET, PCI_SUBDEVICE_ID_QEMU,
+ /* PCI_SUBVENDOR_ID_REDHAT_QUMRANET */
+ 0x1af4,
+ /* PCI_SUBDEVICE_ID_QEMU */
+ 0x1100,
0, 0, 0 },
{ PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_5446, PCI_VENDOR_ID_XEN,
0x0001, 0, 0, 0 },
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 670beeb..3d11fb7 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -212,9 +212,11 @@ static void intel_detect_pch(struct drm_device *dev)
(id == INTEL_PCH_P3X_DEVICE_ID_TYPE) ||
((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&
pch->subsystem_vendor ==
- PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
+ /* PCI_SUBVENDOR_ID_REDHAT_QUMRANET */
+ 0x1af4 &&
pch->subsystem_device ==
- PCI_SUBDEVICE_ID_QEMU)) {
+ /* PCI_SUBDEVICE_ID_QEMU */
+ 0x1100)) {
dev_priv->pch_type = intel_virt_detect_pch(dev);
} else
continue;
--
2.12.0
