From bff22f7317a39605d53cf142e2c0f5c424d9c12c Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sat, 22 Mar 2014 19:21:26 +0100 Subject: [PATCH] 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 --- lib/Makefile.sources | 2 +- lib/drmtest.h | 17 ++++++++++++++ lib/intel_gpu_tools.h | 50 ++++++++++++++--------------------------- lib/{intel_drm.c => intel_os.c} | 0 tools/quick_dump/Makefile.am | 2 +- 5 files changed, 36 insertions(+), 35 deletions(-) rename lib/{intel_drm.c => intel_os.c} (100%) diff --git a/lib/Makefile.sources b/lib/Makefile.sources index e6ada3c..e3942ac 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -15,7 +15,7 @@ libintel_tools_la_SOURCES = \ intel_batchbuffer.c \ intel_batchbuffer.h \ intel_chipset.h \ - intel_drm.c \ + intel_os.c \ intel_gpu_tools.h \ intel_mmio.c \ intel_chipset.c \ diff --git a/lib/drmtest.h b/lib/drmtest.h index 593f31b..ed6040f 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -47,6 +47,19 @@ #include "ioctl_wrappers.h" #include "igt_core.h" +#ifdef ANDROID +#ifndef HAVE_MMAP64 +extern void* __mmap2(void *, size_t, int, int, int, off_t); +static inline void *mmap64(void *addr, size_t length, int prot, int flags, + int fd, off64_t offset) +{ + return __mmap2(addr, length, prot, flags, fd, offset >> 12); +} +#endif +#endif + +#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0])) + int drm_get_card(void); int drm_open_any(void); int drm_open_any_render(void); @@ -85,4 +98,8 @@ void igt_drop_root(void); void igt_wait_for_keypress(void); +/* sysinfo cross-arch wrappers from intel_os.c */ +uint64_t intel_get_total_ram_mb(void); +uint64_t intel_get_total_swap_mb(void); + #endif /* DRMTEST_H */ diff --git a/lib/intel_gpu_tools.h b/lib/intel_gpu_tools.h index 37cbcb1..aab0729 100644 --- a/lib/intel_gpu_tools.h +++ b/lib/intel_gpu_tools.h @@ -34,31 +34,32 @@ #include "intel_chipset.h" #include "intel_reg.h" +#include "drmtest.h" -#ifdef ANDROID -#ifndef HAVE_MMAP64 -extern void* __mmap2(void *, size_t, int, int, int, off_t); -static inline void *mmap64(void *addr, size_t length, int prot, int flags, - int fd, off64_t offset) -{ - return __mmap2(addr, length, prot, flags, fd, offset >> 12); -} -#endif -#endif - -#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0])) - +/* register access helpers from intel_mmio.c */ extern void *mmio; void intel_get_mmio(struct pci_device *pci_dev); +void intel_map_file(char *); -/* New style register access API */ int intel_register_access_init(struct pci_device *pci_dev, int safe); void intel_register_access_fini(void); uint32_t intel_register_read(uint32_t reg); void intel_register_write(uint32_t reg, uint32_t val); int intel_register_access_needs_fakewake(void); -/* Following functions are relevant only for SoCs like Valleyview */ +static inline uint32_t +INREG(uint32_t reg) +{ + return *(volatile uint32_t *)((volatile char *)mmio + reg); +} + +static inline void +OUTREG(uint32_t reg, uint32_t val) +{ + *(volatile uint32_t *)((volatile char *)mmio + reg) = val; +} + +/* sideband access functions from intel_iosf.c */ uint32_t intel_dpio_reg_read(uint32_t reg, int phy); void intel_dpio_reg_write(uint32_t reg, uint32_t val, int phy); @@ -67,6 +68,7 @@ int intel_punit_write(uint8_t addr, uint32_t val); int intel_nc_read(uint8_t addr, uint32_t *val); int intel_nc_write(uint8_t addr, uint32_t val); +/* register maps from intel_reg_map.c */ #define INTEL_RANGE_RSVD (0<<0) /* Shouldn't be read or written */ #define INTEL_RANGE_READ (1<<0) #define INTEL_RANGE_WRITE (1<<1) @@ -87,22 +89,4 @@ struct intel_register_map { struct intel_register_map intel_get_register_map(uint32_t devid); struct intel_register_range *intel_get_register_range(struct intel_register_map map, uint32_t offset, uint32_t mode); - -static inline uint32_t -INREG(uint32_t reg) -{ - return *(volatile uint32_t *)((volatile char *)mmio + reg); -} - -static inline void -OUTREG(uint32_t reg, uint32_t val) -{ - *(volatile uint32_t *)((volatile char *)mmio + reg) = val; -} - -uint64_t intel_get_total_ram_mb(void); -uint64_t intel_get_total_swap_mb(void); - -void intel_map_file(char *); - #endif /* INTEL_GPU_TOOLS_H */ diff --git a/lib/intel_drm.c b/lib/intel_os.c similarity index 100% rename from lib/intel_drm.c rename to lib/intel_os.c diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am index e6329c9..7572ee5 100644 --- a/tools/quick_dump/Makefile.am +++ b/tools/quick_dump/Makefile.am @@ -8,7 +8,7 @@ bin_SCRIPTS = chipset.py lib_LTLIBRARIES = I915ChipsetPython.la I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(PCIACCESS_LIBS) I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c \ - $(top_srcdir)/lib/intel_drm.c \ + $(top_srcdir)/lib/intel_os.c \ $(top_srcdir)/lib/intel_chipset.c \ $(top_srcdir)/lib/intel_reg_map.c \ $(top_srcdir)/lib/intel_mmio.c \ -- 2.7.4