diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-14 15:56:14 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-14 15:57:40 +0000 |
| commit | 41570d9bf583d35687bab88ac88620af41404836 (patch) | |
| tree | 48c8cba44c9785ce392c7791323cdbb1dc31231d /lib | |
| parent | dac602b7b3678c82dd7bc41f258e6518efb8d6cd (diff) | |
Remove confusing use of IS_9XX
... and test for what we mean instead.
Reported-by: Diego Celix <dcelix@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/instdone.c | 2 | ||||
| -rwxr-xr-x | lib/intel_chipset.h | 9 | ||||
| -rw-r--r-- | lib/intel_mmio.c | 6 |
3 files changed, 6 insertions, 11 deletions
diff --git a/lib/instdone.c b/lib/instdone.c index 305f3618..3e4d8957 100644 --- a/lib/instdone.c +++ b/lib/instdone.c @@ -275,7 +275,7 @@ init_instdone_definitions(uint32_t devid) } else { init_g965_instdone1(); } - } else if (IS_9XX(devid)) { + } else if (IS_GEN3(devid)) { gen3_instdone_bit(IDCT_DONE, "IDCT"); gen3_instdone_bit(IQ_DONE, "IQ"); gen3_instdone_bit(PR_DONE, "PR"); diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h index 48c441d8..d1e50881 100755 --- a/lib/intel_chipset.h +++ b/lib/intel_chipset.h @@ -125,10 +125,6 @@ devid == PCI_CHIP_I946_GZ || \ IS_G4X(devid)) -#define IS_965(devid) (IS_GEN4(devid) || \ - IS_GEN5(devid) || \ - IS_GEN6(devid)) - #define IS_GEN5(devid) (IS_ILD(devid) || IS_ILM(devid)) #define IS_GEN6(devid) (devid == PCI_CHIP_SANDYBRIDGE_GT1 || \ @@ -139,9 +135,8 @@ devid == PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS || \ devid == PCI_CHIP_SANDYBRIDGE_S) -#define IS_9XX(devid) (IS_GEN3(devid) || \ - IS_GEN4(devid) || \ - IS_GEN4(devid) || \ +#define IS_965(devid) (IS_GEN4(devid) || \ + IS_GEN5(devid) || \ IS_GEN6(devid)) #define IS_INTEL(devid) (IS_GEN2(devid) || \ diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c index faaeeef6..0228a875 100644 --- a/lib/intel_mmio.c +++ b/lib/intel_mmio.c @@ -71,10 +71,10 @@ intel_get_mmio(struct pci_device *pci_dev) int err; devid = pci_dev->device_id; - if (IS_9XX(devid)) - mmio_bar = 0; - else + if (IS_GEN2(devid)) mmio_bar = 1; + else + mmio_bar = 0; err = pci_device_map_range (pci_dev, pci_dev->regions[mmio_bar].base_addr, |