92 Commits

Author SHA1 Message Date
Damien Lespiau
e949c42b49 quick_dump: Expand the WM cursor registers
The tool I used to generate that list doesn't support expanding the list
of registers when dealing with something like CUR_WM_A_*. Expand it by
hand for now (tm).

Remove CUR_PAL_${pipe}_* for the same reason (and because it's not very
useful to have).

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-05-12 16:41:09 +01:00
Damien Lespiau
5f932c4dad quick_dump/skl: Add more pipe/plane registers
With the recent developments, add scaler and NV12 registers to the dump.
Also add the cursor registers that were missing in the first batch.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-05-11 19:31:26 +01:00
Damien Lespiau
f6155ac30c build: Add missing line continuation
When -lrt was added, it was missing a '\' at the end of line. Add it.

Cc: Tim Gore <tim.gore@intel.com>
Cc: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-05-11 17:55:36 +01:00
Tim Gore
20ad3e55fb tools/quick_dump/makefile.am: add -lrt to get clock_gettime
Attempting to build IGT on linux without libunwind fails
due to tools/quick_dump not linking the rt library,
causing an undefined symbol error for clock_gettime.
Adding -lrt to the list of libraries in Makefile.am fixes
this.

Signed-off-by: Tim Gore <tim.gore@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
2015-04-22 18:00:42 +01:00
Ville Syrjälä
4271b15f3c quick_dump: Fix undefined symbols from libunwind
../../lib/.libs/libintel_tools.a(igt_core.o): In function `print_backtrace':
intel-gpu-tools/lib/igt_core.c:981: undefined reference to `_Ux86_64_getcontext'
intel-gpu-tools/lib/igt_core.c:982: undefined reference to `_ULx86_64_init_local'
intel-gpu-tools/lib/igt_core.c:983: undefined reference to `_ULx86_64_step'
intel-gpu-tools/lib/igt_core.c:987: undefined reference to `_ULx86_64_get_proc_name'

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2015-04-16 16:38:03 +03:00
Ville Syrjälä
3dff4af5e0 quick_dump: Don't allow undefined symbols in _chipset.so
Every time _chipset.so has undefined symbols we fail to notice it
at build time and then get to wonder why quick_dump fails to actually
work. Pass -Wl,--no-undefined to the linker to get a build time error
instead of the current runtime error.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2015-04-16 16:38:03 +03:00
Damien Lespiau
06a9c35664 quick_dump/skl: Add power well registers
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-03-24 11:58:57 +00:00
Damien Lespiau
cd6644230b quick_dump: Add interrupt and PPAT registers to the SKL dump
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2015-02-13 17:00:15 +00:00
Thomas Wood
bdbf78db01 tools: add missing copyright headers
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
2014-12-10 15:55:58 +00:00
Thomas Wood
86bb6072a6 tools/quick_dump: don't include generated sources in the distribution
This also ensures that "make dist" works even if SWIG is not available.

BUILT_SOURCES is not required because the files are already explicit
dependencies of other rules.

v2: make sure SWIG is not invoked with the incorrect output filename

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
2014-11-06 10:21:50 +00:00
Thomas Wood
d2595d7650 quick_dump: fix distcheck
Commit 711a17a (quick_dump: Move base_display.txt to indivual platforms)
renamed base_display.txt to common_display.txt, but didn't update
Makefile.am accordingly. Since common_display.txt is now included in the
platform files, it is automatically included in $(QUICK_DUMP_EXTRA_DIST)
and therefore just the reference to base_display.txt needs removing.

Cc: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
2014-10-17 15:34:44 +01:00
Damien Lespiau
7041edfd14 quick_dump: Drop common_display.txt from VLV/CHV
Those registers are big core registers and weren't really relevant for
VLV/CHV. Drop them from the dump then.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2014-10-08 10:25:48 +01:00
Damien Lespiau
7f8228955f quick_dump/skl: Make quick_dump SKL aware
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2014-10-06 18:58:33 +01:00
Damien Lespiau
d0a412597b quick_dump/skl: Add some display registers
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2014-10-06 18:58:33 +01:00
Damien Lespiau
711a17ac75 quick_dump: Move base_display.txt to indivual platforms
SKL will have a whole separate display regs file, so merge
base_display.txt into each platform file.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2014-10-06 18:58:33 +01:00
Damien Lespiau
2faf5a8665 quick-dump: Make quick dump link against libintel_tools
Because quick-dump was only selecting a few files in lib/ and we move
stuff around and/or add new dependencies we were failing to provide the
necessary symbols to the shim library providing python bindings. And so
we had a run-time error:

Traceback (most recent call last):
  File "./tools/quick_dump/quick_dump.py", line 17, in <module>
    import chipset
  File "/home/damien/gfx/sources/intel-gpu-tools/tools/quick_dump/chipset.py", line 28, in <module>
    _chipset = swig_import_helper()
  File "/home/damien/gfx/sources/intel-gpu-tools/tools/quick_dump/chipset.py", line 24, in swig_import_helper
    _mod = imp.load_module('_chipset', fp, pathname, description)
  File "/usr/lib64/python3.3/imp.py", line 183, in load_module
    return load_dynamic(name, filename, file)
ImportError: /home/damien/gfx/sources/intel-gpu-tools/tools/quick_dump/_chipset.so: undefined symbol: kmstest_pipe_name

So, let's simplify maintainance and just link against the library we're
building and using elsewhere.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
2014-10-06 18:58:11 +01:00
Thomas Wood
fcbc5028ae quick_dump: fix distcheck
version.h is now generated in the libs directory, so make sure it is
correctly included in the compiler flags.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
2014-07-25 14:46:51 +01:00
Thomas Wood
c54ee9819a quick_dump: read the architecture files for items to add to EXTRA_DIST
Each architecture file contains a list of the text files it requires, so
use this to add to the list of files to distribute.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
2014-06-12 10:12:13 +01:00
Rodrigo Vivi
9bddb5eebd quick_dump: Fix vlv file names on Makefile.am 2014-06-09 10:47:13 -07:00
Imre Deak
1451df1cb6 quick_dump: increase reg name column width
Needed by the new long audio register names.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
ea43f5163a quick_dump: vlv: remove redundant base file specifications
The registers in these files are included in the dumps for all platforms
by default, so no need to specify them explicitly.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
24cd3843cb quick_dump: vlv: move flisdsi register group to its logical place
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
75b921688d quick_dump: vlv: add missing dpio phy registers
Also move the phy register block to its logical place.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
9da08fed03 quick_dump: vlv: add missing display registers
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
92378d3b77 quick_dump: chv: add misc gen7 GT registers
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
861cea8b52 quick_dump: chv: add dsi (mipi) registers
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Imre Deak
a4b53d2125 quick_dump: vlv: clean up dsi (mipi) registers
Split out the base offset into the third argument and rename MIPIB to
MIPIC to match the display cluster register HAS.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:43 +03:00
Ville Syrjälä
a115c48208 quick_dump: chv: add full dpio phy dumps
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
2014-06-03 22:19:42 +03:00
Ville Syrjälä
e23f1fdfee quick_dump: chv: add display registers
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[imre: add audio regs]
Reviewed-by: Imre Deak <imre.deak@intel.com>
2014-06-03 22:19:42 +03:00
Ville Syrjälä
6d2577c741 quick_dump: chv: add detection support
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
2014-06-03 22:19:42 +03:00
Ville Syrjälä
9a642a7287 quick_dump: add support for accessing the dpio phy 2 registers
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
2014-06-03 22:19:42 +03:00
Imre Deak
82fcb90619 quick_dump: allow passing display base as the third argument
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
2014-06-03 22:19:42 +03:00
Ville Syrjälä
4e696ff8c9 quick_dump: pass register offsets as int
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[imre: fix s/regi/intreg/ typo]
Reviewed-by: Imre Deak <imre.deak@intel.com>
2014-06-03 22:19:42 +03:00
Imre Deak
76bc5fdf46 quick_dump: fix typo breaking dpio reg dumps
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
2014-06-03 22:19:42 +03:00
Imre Deak
4f0bb31470 quick_dump: make autodetect the default option
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Very-much-wanted-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-06-03 18:43:47 +03:00
Imre Deak
a6eaa29271 igt/quickdump: vlv: dump FLISDSI regs too
Signed-off-by: Imre Deak <imre.deak@intel.com>
2014-05-19 20:13:15 +03:00
Daniel Vetter
4fdca96066 tools/quick_dump: Fix make distcheck
Someone really needs to fix this Makefile ...

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-03-28 17:54:58 +01:00
Ben Widawsky
47c551bd70 quick_dump: Put the cairo cflags with the other cflags.
I had been hoping we can avoid linking against cairo, but alas it was
not meant to be.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-03-27 09:56:59 -07:00
Daniel Vetter
9048aa1974 tools/quick_dump: re-apply ducttape
Someone with actual automake-fu really needs to fix this up for real
since compiling a bunch of source files again, with broken dep
tracking even just because we can't link against a .la somehow really
isn't too awesome.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-03-26 22:57:52 +01:00
Ben Widawsky
785a0cd4ba quick_dump: Fix the danvet fallout.
quick_dump built fine, but it could actually run, since a lot of the
linking happens at run time. There is one hack where we redefine the
environment stuff, since depending on igt_aux means we have to pull in
libdrm, which I do not want to do.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-03-26 09:02:58 -07:00
Daniel Vetter
bff22f7317 lib: Move non-register things out of intel-gpu-tools.h
Right now almost everything in there concerns itself with register
access. Move everything else out (into drmtest.h for lack of better
place) to prepare for api documentation.

Also rename intel_drm.c to intel_os.c since it contains OS, not
drm abstractions.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-03-22 19:39:37 +01:00
Daniel Vetter
94e1b6af99 lib: rename intel_pci.c to intel_chipset.c
This is to consolidate all the chipset related functions to
intel_chipset.[hc].

Unfortunately we need to rename a wrapper lib file in quick_dump, too.
And quick_dump makes automake a bit unhappy apparently.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-03-22 14:47:21 +01:00
Ben Widawsky
00bd3eba11 quick_dump: gen8 private PAT
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-03-19 10:14:57 -07:00
Ben Widawsky
8ebc02a54c quick_dump: Add missed broadwell autodetect
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-02-21 13:15:35 -08:00
Ben Widawsky
e72f3bcc77 quick_dump/broadwell: Add gen7 ring mode registers
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-02-02 10:48:54 +01:00
Ben Widawsky
56d347fad8 quick_dump/haswell: Add gen7 stuff + VECS_MODE
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-02-02 10:48:54 +01:00
Ben Widawsky
556c200e99 quick_dump/gen7: Add other GFX_MODE registers
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-02-02 10:48:54 +01:00
Ben Widawsky
b5a1ab3d6e quick_dump: Add a file argument
-f, or --file will simply dump the file in the specified format. All
other options will be skipped. This is helpful when one wants to create
their own list for temporary debug, or if one requires a subset of
registers to work around things like fused off PCH.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-02-02 10:48:54 +01:00
Ben Widawsky
8ce7c366d7 quick_dump: Refactor to allow future code
Extract everything possible, and create a main function which is pretty
darn simple. The goal is to make the various paths the program can take
based on command line options (one more is coming) more decipherable.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
2014-02-02 10:48:54 +01:00
Jesse Barnes
81095305f4 mmio: use intel_iosf.c for DPIO reads and writes
This makes it a bit more like the kernel, so we can go poke at DPIO and
other IOSF regs a bit more easily.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2014-01-28 13:58:01 -08:00