diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-29 08:28:58 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-06-30 23:06:47 +0100 |
| commit | d308bb082d429eb25dfd2844bcbafe722660a1ff (patch) | |
| tree | c0524698b1a41ade66bac888427e87cc1335becd /tools/intel_audio_dump.c | |
| parent | 0404de4f223c108cf181f6c9a26fdc84fc608fc5 (diff) | |
lib: Start weaning off defunct intel_chipset.h
Several years ago we made the plan of only having one canonical source
for i915_pciids.h, the kernel and everyone importing their definitions
from that. For consistency, we style the intel_device_info after the
kernel, most notably using a generation mask and a per-codename bitfield.
This first step converts looking up the generation for a devid tree from
a massive if(devid)-chain to a (cached) table lookup.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tools/intel_audio_dump.c')
| -rw-r--r-- | tools/intel_audio_dump.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tools/intel_audio_dump.c b/tools/intel_audio_dump.c index aec4177c..aacd52f4 100644 --- a/tools/intel_audio_dump.c +++ b/tools/intel_audio_dump.c @@ -2476,31 +2476,21 @@ int main(int argc, char **argv) else intel_mmio_use_pci_bar(pci_dev); + printf("%s audio registers:\n\n", intel_device_info(devid)->codename); if (IS_VALLEYVIEW(devid)) { - printf("Valleyview audio registers:\n\n"); dump_ironlake(); } else if (IS_GEN9(devid) || IS_BROADWELL(devid) || IS_HASWELL(devid)) { - printf("%s audio registers:\n\n", - IS_BROXTON(devid) ? "Broxton" : - (IS_KABYLAKE(devid) ? "Kabylake" : - (IS_SKYLAKE(devid) ? "Skylake" : - (IS_BROADWELL(devid) ? "Broadwell" : "Haswell")))); dump_hsw_plus(); } else if (IS_GEN6(devid) || IS_GEN7(devid) || getenv("HAS_PCH_SPLIT")) { - printf("%s audio registers:\n\n", - IS_GEN6(devid) ? "SandyBridge" : "IvyBridge"); intel_check_pch(); dump_cpt(); } else if (IS_GEN5(devid)) { - printf("Ironlake audio registers:\n\n"); dump_ironlake(); } else if (IS_G4X(devid)) { - printf("G45 audio registers:\n\n"); dump_eaglelake(); } else if (IS_CHERRYVIEW(devid)) { - printf("Braswell audio registers:\n\n"); dump_braswell(); } |