On Sun, Mar 23, 2014 at 03:18:34PM +0100, Daniel Vetter wrote: > Hi all, > > So this thing turned out to be fairly ugly overall, and I don't think it's worth > the effort to polish the series through some giant rebasing. make distcheck > still works so I don't think I've fumbled this too badly and will hence just > push the patches as-is. > > I'm still very much interested in feedback, I'll simply apply that as follow-up > patches. > > For those who want a peak at what the i-g-t docs look like now: > > http://people.freedesktop.org/~danvet/igt/ > > Everything but the modeset helpers is now neatly documented, with some intro > texts where useful. I think for the igt_display/kms libraries we first need to > give the apis a bit more polish before documentation makes sense. There's still > an awful lot of boilerplate going on in kms tests ... > > Cheers, Daniel > > Daniel Vetter (28): > lib: rename intel_pci.c to intel_chipset.c > lib: consolidate chipset helpers in intel_chipset.[hc] > lib/intel_chipset: intel_ prefix for pch global > lib/intel_chipset: api docs > lib: make rendercopy.h an internal header > lib: make media_fill.h an internal header > lib/intel_batchbuffer: un-inline buf_height/width > lib/intel_batchbuffer: igt_ namespace for the buffer structure > lib/intel_batchbuffer: igt_ prefix for rendercopy/mediafill funcs > lib/intel_batchbuffer: drop cpu_mapping from igt_buf > lib/intel_batchbuffer: api documentation for render copy/media fill > lib: Move non-register things out of intel-gpu-tools.h > tests|lib: remove assert.h includes > lib: add #include "foo.h" lines like in manpages > lib: remove uncessary #includes from headers > lib: more unecessary header removal > lib: unnecessary header removal for drmtest.h, part 1 > lib: unnecessary header removal for drmtest.h, part 2 > lib: rename intel_gpu_tools.h to intel_io.h > lib/intel_io: rename mmio setup functions > lib/intel_io: api documentation > lib: s/drmtest_dumb_aub/igt_aub_dump_enabled/ > lib: extract igt_aux.[hc] > lib/igt_aux: api documentation > lib: s/igt_env_set/igt_check_boolean_env_var > lib: Use @include tag for include files > lib/drmtest: api documentation > lib/intel_batchbuffer: document header dependencies Note that the quick_dump automake rules seem to be a bit fragile and fall over a few of the renames in here. Running git clean -dfx and rebuilding everything fixes that. Unfortunately my autofoo isn't up to snuff to fix this. -Daniel > > benchmarks/intel_upload_blit_large.c | 9 +- > benchmarks/intel_upload_blit_large_gtt.c | 3 +- > benchmarks/intel_upload_blit_large_map.c | 3 +- > benchmarks/intel_upload_blit_small.c | 3 +- > debugger/debug_rdata.c | 3 +- > debugger/eudb.c | 2 +- > demos/intel_sprite_on.c | 7 +- > .../intel-gpu-tools/intel-gpu-tools-docs.xml | 5 +- > lib/Makefile.sources | 9 +- > lib/drmtest.c | 243 +++----------- > lib/drmtest.h | 80 +++-- > lib/gen6_render.h | 8 - > lib/gen7_media.h | 2 + > lib/gen8_media.h | 2 + > lib/igt_aux.c | 373 +++++++++++++++++++++ > lib/igt_aux.h | 67 ++++ > lib/igt_core.c | 9 +- > lib/igt_core.h | 7 + > lib/igt_debugfs.c | 3 + > lib/igt_debugfs.h | 3 +- > lib/igt_kms.c | 14 +- > lib/igt_kms.h | 10 +- > lib/intel_batchbuffer.c | 93 ++++- > lib/intel_batchbuffer.h | 96 +++++- > lib/intel_chipset.c | 215 ++++++++++++ > lib/intel_chipset.h | 26 ++ > lib/intel_drm.c | 200 ----------- > lib/intel_gpu_tools.h | 126 ------- > lib/intel_io.h | 81 +++++ > lib/intel_iosf.c | 61 +++- > lib/intel_mmio.c | 133 +++++++- > lib/intel_os.c | 171 ++++++++++ > lib/intel_pci.c | 123 ------- > lib/intel_reg_map.c | 3 +- > lib/ioctl_wrappers.c | 6 +- > lib/ioctl_wrappers.h | 5 + > lib/media_fill.c | 14 - > lib/media_fill.h | 49 +-- > lib/media_fill_gen7.c | 16 +- > lib/media_fill_gen8.c | 16 +- > lib/rendercopy.h | 71 +--- > lib/rendercopy_gen6.c | 51 ++- > lib/rendercopy_gen7.c | 44 ++- > lib/rendercopy_gen8.c | 58 ++-- > lib/rendercopy_i830.c | 64 ++-- > lib/rendercopy_i915.c | 30 +- > tests/core_get_client_auth.c | 2 +- > tests/core_getclient.c | 3 + > tests/core_getstats.c | 5 + > tests/ddi_compute_wrpll.c | 3 +- > tests/drm_vma_limiter.c | 5 +- > tests/drm_vma_limiter_cached.c | 5 +- > tests/drm_vma_limiter_cpu.c | 5 +- > tests/drm_vma_limiter_gtt.c | 5 +- > tests/drv_suspend.c | 11 +- > tests/eviction_common.c | 1 + > tests/gem_bad_address.c | 5 +- > tests/gem_bad_batch.c | 5 +- > tests/gem_bad_blit.c | 5 +- > tests/gem_bad_length.c | 2 +- > tests/gem_basic.c | 2 +- > tests/gem_caching.c | 10 +- > tests/gem_close_race.c | 3 +- > tests/gem_concurrent_blit.c | 10 +- > tests/gem_cpu_reloc.c | 10 +- > tests/gem_cs_prefetch.c | 10 +- > tests/gem_cs_tlb.c | 9 +- > tests/gem_ctx_bad_destroy.c | 4 +- > tests/gem_ctx_bad_exec.c | 2 +- > tests/gem_ctx_basic.c | 24 +- > tests/gem_ctx_create.c | 4 +- > tests/gem_ctx_exec.c | 8 +- > tests/gem_double_irq_loop.c | 5 +- > tests/gem_dummy_reloc_loop.c | 5 +- > tests/gem_evict_alignment.c | 8 +- > tests/gem_evict_everything.c | 3 +- > tests/gem_exec_bad_domains.c | 5 +- > tests/gem_exec_big.c | 2 +- > tests/gem_exec_blt.c | 4 +- > tests/gem_exec_faulting_reloc.c | 4 +- > tests/gem_exec_lut_handle.c | 2 +- > tests/gem_exec_nop.c | 4 +- > tests/gem_fd_exhaustion.c | 3 + > tests/gem_fence_thrash.c | 34 +- > tests/gem_fenced_exec_thrash.c | 8 +- > tests/gem_flink.c | 2 +- > tests/gem_flink_race.c | 3 +- > tests/gem_gtt_cpu_tlb.c | 4 +- > tests/gem_gtt_hog.c | 3 +- > tests/gem_gtt_speed.c | 2 +- > tests/gem_hang.c | 5 +- > tests/gem_hangcheck_forcewake.c | 5 +- > tests/gem_largeobject.c | 2 +- > tests/gem_linear_blits.c | 12 +- > tests/gem_lut_handle.c | 2 +- > tests/gem_madvise.c | 2 +- > tests/gem_media_fill.c | 29 +- > tests/gem_mmap.c | 2 +- > tests/gem_mmap_gtt.c | 2 +- > tests/gem_mmap_offset_exhaustion.c | 2 +- > tests/gem_non_secure_batch.c | 5 +- > tests/gem_partial_pwrite_pread.c | 12 +- > tests/gem_persistent_relocs.c | 12 +- > tests/gem_pin.c | 9 +- > tests/gem_pipe_control_store_loop.c | 5 +- > tests/gem_pread.c | 2 +- > tests/gem_pread_after_blit.c | 12 +- > tests/gem_pwrite.c | 2 +- > tests/gem_pwrite_pread.c | 5 +- > tests/gem_readwrite.c | 2 +- > tests/gem_reg_read.c | 4 +- > tests/gem_reloc_overflow.c | 5 +- > tests/gem_reloc_vs_gpu.c | 12 +- > tests/gem_render_copy.c | 40 ++- > tests/gem_render_linear_blits.c | 31 +- > tests/gem_render_tiled_blits.c | 27 +- > tests/gem_reset_stats.c | 11 +- > tests/gem_ring_sync_copy.c | 21 +- > tests/gem_ring_sync_loop.c | 5 +- > tests/gem_ringfill.c | 26 +- > tests/gem_seqno_wrap.c | 22 +- > tests/gem_set_tiling_vs_blt.c | 5 +- > tests/gem_set_tiling_vs_gtt.c | 5 +- > tests/gem_set_tiling_vs_pwrite.c | 4 +- > tests/gem_storedw_batches_loop.c | 7 +- > tests/gem_storedw_loop_blt.c | 5 +- > tests/gem_storedw_loop_bsd.c | 5 +- > tests/gem_storedw_loop_render.c | 5 +- > tests/gem_storedw_loop_vebox.c | 5 +- > tests/gem_stress.c | 87 +++-- > tests/gem_threaded_access_tiled.c | 2 +- > tests/gem_tiled_blits.c | 12 +- > tests/gem_tiled_fence_blits.c | 10 +- > tests/gem_tiled_partial_pwrite_pread.c | 12 +- > tests/gem_tiled_pread.c | 5 +- > tests/gem_tiled_pread_pwrite.c | 9 +- > tests/gem_tiled_swapping.c | 9 +- > tests/gem_tiling_max_stride.c | 5 +- > tests/gem_unfence_active_buffers.c | 5 +- > tests/gem_unref_active_buffers.c | 5 +- > tests/gem_vmap_blits.c | 5 +- > tests/gem_wait_render_timeout.c | 22 +- > tests/gem_write_read_ring_switch.c | 12 +- > tests/gen3_mixed_blits.c | 5 +- > tests/gen3_render_linear_blits.c | 5 +- > tests/gen3_render_mixed_blits.c | 5 +- > tests/gen3_render_tiledx_blits.c | 5 +- > tests/gen3_render_tiledy_blits.c | 5 +- > tests/gen7_forcewake_mt.c | 5 +- > tests/igt_fork_helper.c | 1 + > tests/igt_simulation.c | 2 + > tests/kms_addfb.c | 2 +- > tests/kms_cursor_crc.c | 1 + > tests/kms_fbc_crc.c | 12 +- > tests/kms_flip.c | 17 +- > tests/kms_pipe_crc_basic.c | 1 + > tests/kms_plane.c | 1 + > tests/kms_render.c | 7 +- > tests/kms_setmode.c | 27 +- > tests/pm_lpsp.c | 2 + > tests/pm_pc8.c | 5 +- > tests/pm_psr.c | 2 + > tests/pm_rc6_residency.c | 2 + > tests/pm_rps.c | 8 +- > tests/prime_nv_api.c | 3 +- > tests/prime_nv_pcopy.c | 5 +- > tests/prime_nv_test.c | 5 +- > tests/prime_self_import.c | 2 +- > tests/prime_udl.c | 8 +- > tests/testdisplay.c | 6 +- > tools/intel_audio_dump.c | 9 +- > tools/intel_backlight.c | 6 +- > tools/intel_bios_reader.c | 4 +- > tools/intel_dpio_read.c | 3 +- > tools/intel_dpio_write.c | 3 +- > tools/intel_error_decode.c | 3 +- > tools/intel_forcewaked.c | 3 +- > tools/intel_framebuffer_dump.c | 2 +- > tools/intel_gpu_time.c | 6 +- > tools/intel_gpu_top.c | 6 +- > tools/intel_gtt.c | 3 +- > tools/intel_infoframes.c | 8 +- > tools/intel_l3_parity.c | 3 +- > tools/intel_lid.c | 5 +- > tools/intel_nc_read.c | 3 +- > tools/intel_nc_write.c | 3 +- > tools/intel_opregion_decode.c | 3 +- > tools/intel_panel_fitter.c | 4 +- > tools/intel_perf_counters.c | 3 +- > tools/intel_punit_read.c | 3 +- > tools/intel_punit_write.c | 3 +- > tools/intel_reg_checker.c | 5 +- > tools/intel_reg_dumper.c | 17 +- > tools/intel_reg_read.c | 3 +- > tools/intel_reg_snapshot.c | 5 +- > tools/intel_reg_write.c | 3 +- > tools/intel_stepping.c | 3 +- > tools/intel_vga_read.c | 3 +- > tools/intel_vga_write.c | 3 +- > tools/quick_dump/Makefile.am | 6 +- > tools/quick_dump/chipset_macro_wrap.c | 33 ++ > tools/quick_dump/intel_chipset.c | 33 -- > 202 files changed, 2401 insertions(+), 1398 deletions(-) > create mode 100644 lib/igt_aux.c > create mode 100644 lib/igt_aux.h > create mode 100644 lib/intel_chipset.c > delete mode 100644 lib/intel_drm.c > delete mode 100644 lib/intel_gpu_tools.h > create mode 100644 lib/intel_io.h > create mode 100644 lib/intel_os.c > delete mode 100644 lib/intel_pci.c > delete mode 100644 lib/media_fill.c > create mode 100644 tools/quick_dump/chipset_macro_wrap.c > delete mode 100644 tools/quick_dump/intel_chipset.c > > -- > 1.8.5.2 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
