flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-21 13:23:02 +00:00
Code Issues Releases Wiki Activity

Remove confusing use of IS_9XX

Browse Source 
... and test for what we mean instead.

Reported-by: Diego Celix <dcelix@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2011-02-14 15:56:14 +00:00
parent dac602b7b3
commit 41570d9bf5
8 changed files with 94 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/instdone.c
+1 -1
View File
@@ -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");
lib/intel_chipset.h
+2 -7
View File
@@ -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) || \
lib/intel_mmio.c
+3 -3
View File
@@ -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,