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

Search for the first Intel dri device.

Browse Source 
This is vital in a multi-GPU system so that we only test the Intel card
and not the discrete GPUs.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2011-02-01 13:35:36 +00:00
parent c1e9795050
commit 3c5c8ba71c
8 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/intel_audio_dump.c
+1 -1
View File
@@ -1197,7 +1197,7 @@ int main(int argc, char **argv)
if (HAS_PCH_SPLIT(devid) || getenv("HAS_PCH_SPLIT")) {
intel_check_pch();
dump_cpt();
} else if (IS_IRONLAKE(devid))
} else if (IS_GEN5(devid))
dump_ironlake();
else
dump_eaglelake();
tools/intel_decode.c
+4 -4
View File
@@ -1644,7 +1644,7 @@ decode_3d_965(uint32_t *data, int count, uint32_t hw_offset, uint32_t devid, int
case 0x6101:
if (IS_GEN6(devid))
sba_len = 10;
else if (IS_IRONLAKE(devid))
else if (IS_GEN5(devid))
sba_len = 8;
else
sba_len = 6;
@@ -1663,14 +1663,14 @@ decode_3d_965(uint32_t *data, int count, uint32_t hw_offset, uint32_t devid, int
if (IS_GEN6(devid))
state_base_out(data, hw_offset, i++, "dynamic");
state_base_out(data, hw_offset, i++, "indirect");
if (IS_IRONLAKE(devid) || IS_GEN6(devid))
if (IS_GEN5(devid) || IS_GEN6(devid))
state_base_out(data, hw_offset, i++, "instruction");
state_max_out(data, hw_offset, i++, "general");
if (IS_GEN6(devid))
state_max_out(data, hw_offset, i++, "dynamic");
state_max_out(data, hw_offset, i++, "indirect");
if (IS_IRONLAKE(devid) || IS_GEN6(devid))
if (IS_GEN5(devid) || IS_GEN6(devid))
state_max_out(data, hw_offset, i++, "instruction");
return len;
@@ -2071,7 +2071,7 @@ decode_3d_965(uint32_t *data, int count, uint32_t hw_offset, uint32_t devid, int
instr_out(data, hw_offset, 0,
"3DSTATE_DEPTH_BUFFER\n");
if (IS_IRONLAKE(devid) || IS_GEN6(devid))
if (IS_GEN5(devid) || IS_GEN6(devid))
instr_out(data, hw_offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Seperate Stencil %d\n",
get_965_surfacetype(data[1] >> 29),
get_965_depthformat((data[1] >> 18) & 0x7),
tools/intel_disable_clock_gating.c
+1 -1
View File
@@ -40,7 +40,7 @@ int main(int argc, char** argv)
pci_dev = intel_get_pci_device();
intel_get_mmio(pci_dev);
if (IS_IRONLAKE(pci_dev->device_id)) {
if (IS_GEN5(pci_dev->device_id)) {
printf("Restore method:\n");
printf("intel_reg_write 0x%x 0x%08x\n",
tools/intel_gpu_top.c
+1 -1
View File
@@ -409,7 +409,7 @@ int main(int argc, char **argv)
}
ring_init(&render_ring);
if (IS_GEN4(devid) || IS_IRONLAKE(devid))
if (IS_GEN4(devid) || IS_GEN5(devid))
ring_init(&bsd_ring);
if (IS_GEN6(devid)) {
ring_init(&bsd6_ring);
tools/intel_gtt.c
+1 -1
View File
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
exit(1);
}
if (IS_G4X(devid) || IS_IRONLAKE(devid))
if (IS_G4X(devid) || IS_GEN5(devid))
gtt = ((unsigned char *)mmio + MB(2));
else if (IS_965(devid))
gtt = ((unsigned char *)mmio + KB(512));