diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/drm/drmP.h | 2 | ||||
-rw-r--r-- | drivers/char/drm/drm_stub.c | 2 | ||||
-rw-r--r-- | drivers/char/drm/i915_dma.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 4363f6e50c77..7690a59ace04 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -723,6 +723,8 @@ typedef struct drm_device { | |||
723 | drm_agp_head_t *agp; /**< AGP data */ | 723 | drm_agp_head_t *agp; /**< AGP data */ |
724 | 724 | ||
725 | struct pci_dev *pdev; /**< PCI device structure */ | 725 | struct pci_dev *pdev; /**< PCI device structure */ |
726 | int pci_vendor; /**< PCI vendor id */ | ||
727 | int pci_device; /**< PCI device id */ | ||
726 | #ifdef __alpha__ | 728 | #ifdef __alpha__ |
727 | struct pci_controller *hose; | 729 | struct pci_controller *hose; |
728 | #endif | 730 | #endif |
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index a9bb18ac3a2b..7b1d4e8659ba 100644 --- 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, | |||
65 | mutex_init(&dev->ctxlist_mutex); | 65 | mutex_init(&dev->ctxlist_mutex); |
66 | 66 | ||
67 | dev->pdev = pdev; | 67 | dev->pdev = pdev; |
68 | dev->pci_device = pdev->device; | ||
69 | dev->pci_vendor = pdev->vendor; | ||
68 | 70 | ||
69 | #ifdef __alpha__ | 71 | #ifdef __alpha__ |
70 | dev->hose = pdev->sysdata; | 72 | dev->hose = pdev->sysdata; |
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c index a7924e28a847..fb7913ff5286 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/char/drm/i915_dma.c | |||
@@ -31,10 +31,10 @@ | |||
31 | #include "i915_drm.h" | 31 | #include "i915_drm.h" |
32 | #include "i915_drv.h" | 32 | #include "i915_drv.h" |
33 | 33 | ||
34 | #define IS_I965G(dev) (dev->pdev->device == 0x2972 || \ | 34 | #define IS_I965G(dev) (dev->pci_device == 0x2972 || \ |
35 | dev->pdev->device == 0x2982 || \ | 35 | dev->pci_device == 0x2982 || \ |
36 | dev->pdev->device == 0x2992 || \ | 36 | dev->pci_device == 0x2992 || \ |
37 | dev->pdev->device == 0x29A2) | 37 | dev->pci_device == 0x29A2) |
38 | 38 | ||
39 | /* Really want an OS-independent resettable timer. Would like to have | 39 | /* Really want an OS-independent resettable timer. Would like to have |
40 | * this loop run for (eg) 3 sec, but have the timer reset every time | 40 | * this loop run for (eg) 3 sec, but have the timer reset every time |