diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-22 04:19:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:34 +1000 |
| commit | 2f02cc3fb8960754a2a5df6a33f53528e0d830be (patch) | |
| tree | 73c692f47c6f589e394b71b89122f9566ecbd11d /drivers | |
| parent | e08870c87ab5b0c0c3cb05d0d0041240736493e4 (diff) | |
| download | op-kernel-dev-2f02cc3fb8960754a2a5df6a33f53528e0d830be.zip op-kernel-dev-2f02cc3fb8960754a2a5df6a33f53528e0d830be.tar.gz | |
drm: add device/vendor id to drm_device_t for compat with FreeBSD drivers
Signed-off-by: Dave Airlie <airlied@linux.ie>
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 4363f6e..7690a59 100644 --- 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 a9bb18a..7b1d4e8 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, 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 a7924e2..fb7913f 100644 --- 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 |
