diff options
| author | Jesse Barnes <jesse.barnes@intel.com> | 2007-06-22 11:12:02 -0700 |
|---|---|---|
| committer | Jesse Barnes <jesse.barnes@intel.com> | 2007-06-22 11:12:02 -0700 |
| commit | 7f2a1cf2753c0c97b1290469a15322f7549f78ae (patch) | |
| tree | 1375351c4dbe31e2c6b4703bcb685f89b7fb2c46 /shared-core/i915_dma.c | |
| parent | d2d53024fb4003a6b86a3ea1ea33c76ac20bebc9 (diff) | |
| parent | 97dcd7fd25c18d5148619254229f8d94efb55b44 (diff) | |
Merge branch 'vblank-rework' into vblank
Diffstat (limited to 'shared-core/i915_dma.c')
| -rw-r--r-- | shared-core/i915_dma.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index ebb184cc..b2398896 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -31,17 +31,6 @@ #include "i915_drm.h" #include "i915_drv.h" -#define IS_I965G(dev) (dev->pci_device == 0x2972 || \ - dev->pci_device == 0x2982 || \ - dev->pci_device == 0x2992 || \ - dev->pci_device == 0x29A2 || \ - dev->pci_device == 0x2A02 || \ - dev->pci_device == 0x2A12) - -#define IS_G33(dev) (dev->pci_device == 0x29C2 || \ - dev->pci_device == 0x29B2 || \ - dev->pci_device == 0x29D2) - /* 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 * the head pointer changes, so that EBUSY only happens if the ring |