drm: add device/vendor id to drm_device_t for compat with FreeBSD drivers

Signed-off-by: Dave Airlie <airlied@linux.ie>

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 4363f6e50c77e647b8b0b8a10428f2b814c3dcd9..7690a59ace0426b0249127831b3d668bab2bb444 100644 (file)
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -723,6 +723,8 @@ typedef struct drm_device {
        drm_agp_head_t *agp;    /**< AGP data */
 
        struct pci_dev *pdev;           /**< PCI device structure */
+       int pci_vendor;                 /**< PCI vendor id */
+       int pci_device;                 /**< PCI device id */
 #ifdef __alpha__
        struct pci_controller *hose;
 #endif

diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index a9bb18ac3a2b35d0bf82516e93df3574f104e75b..7b1d4e8659baa41e71560f8c02d5592baa66ea4a 100644 (file)
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -65,6 +65,8 @@ static int drm_fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
        mutex_init(&dev->ctxlist_mutex);
 
        dev->pdev = pdev;
+       dev->pci_device = pdev->device;
+       dev->pci_vendor = pdev->vendor;
 
 #ifdef __alpha__
        dev->hose = pdev->sysdata;

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index a7924e28a847a6c57f34e7226b7db0f63abbe462..fb7913ff5286b58e6fd8b5a574590f8e1d8f8948 100644 (file)
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -31,10 +31,10 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-#define IS_I965G(dev) (dev->pdev->device == 0x2972 || \
-                      dev->pdev->device == 0x2982 || \
-                      dev->pdev->device == 0x2992 || \
-                      dev->pdev->device == 0x29A2)
+#define IS_I965G(dev) (dev->pci_device == 0x2972 || \
+                      dev->pci_device == 0x2982 || \
+                      dev->pci_device == 0x2992 || \
+                      dev->pci_device == 0x29A2)
 
 /* Really want an OS-independent resettable timer.  Would like to have
  * this loop run for (eg) 3 sec, but have the timer reset every time