flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-09 08:56:11 +00:00
Code Issues Releases Wiki Activity

lib: Move non-register things out of intel-gpu-tools.h

Browse Source 
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>
This commit is contained in:
Daniel Vetter 2014-03-22 19:21:26 +01:00
parent 7754c4dd76
commit bff22f7317
5 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.sources
View File

@ -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 \

17
lib/drmtest.h
View File

@ -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 */

50
lib/intel_gpu_tools.h
View File

@ -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 */

0
lib/intel_drm.c → lib/intel_os.c
View File

2
tools/quick_dump/Makefile.am
View File

@ -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 \