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

build: Fix assorted compilation warnings

Browse Source 
As these files are compiled for every test, the warnings cluttered
the Android build completely.

v2: As suggested by Daniel Vetter, drop some of the fixes and fix
the compilation flags instead.

Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Oscar Mateo 2013-11-12 11:50:42 +00:00 committed by Daniel Vetter
parent dce0d99a91
commit 5032e7bbdd
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/drmtest.c
View File

@ -306,7 +306,7 @@ int drm_open_any_render(void)
return fd; return fd;
} }
int __gem_set_tiling(int fd, uint32_t handle, int tiling, int stride) int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride)
{ {
struct drm_i915_gem_set_tiling st; struct drm_i915_gem_set_tiling st;
int ret; int ret;
@ -326,7 +326,7 @@ int __gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
return 0; return 0;
} }
void gem_set_tiling(int fd, uint32_t handle, int tiling, int stride) void gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride)
{ {
igt_assert(__gem_set_tiling(fd, handle, tiling, stride) == 0); igt_assert(__gem_set_tiling(fd, handle, tiling, stride) == 0);
} }
@ -654,7 +654,7 @@ off_t prime_get_size(int dma_buf_fd)
/* signal interrupt helpers */ /* signal interrupt helpers */
static bool igt_only_list_subtests(void); static bool igt_only_list_subtests(void);
static int exit_handler_count; static unsigned int exit_handler_count;
static struct igt_helper_process signal_helper; static struct igt_helper_process signal_helper;
long long int sig_stat; long long int sig_stat;

4
lib/drmtest.h
View File

@ -54,8 +54,8 @@ int drm_open_any_render(void);
void gem_quiescent_gpu(int fd); void gem_quiescent_gpu(int fd);
/* ioctl wrappers and similar stuff for bare metal testing */ /* ioctl wrappers and similar stuff for bare metal testing */
void gem_set_tiling(int fd, uint32_t handle, int tiling, int stride); void gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride);
int __gem_set_tiling(int fd, uint32_t handle, int tiling, int stride); int __gem_set_tiling(int fd, uint32_t handle, uint32_t tiling, uint32_t stride);
bool gem_has_enable_ring(int fd,int param); bool gem_has_enable_ring(int fd,int param);
bool gem_has_bsd(int fd); bool gem_has_bsd(int fd);
bool gem_has_blt(int fd); bool gem_has_blt(int fd);

2
lib/intel_batchbuffer.h
View File

@ -47,7 +47,7 @@ void intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
* work... * work...
*/ */
#pragma GCC diagnostic ignored "-Winline" #pragma GCC diagnostic ignored "-Winline"
static inline int static inline unsigned int
intel_batchbuffer_space(struct intel_batchbuffer *batch) intel_batchbuffer_space(struct intel_batchbuffer *batch)
{ {
return (BATCH_SZ - BATCH_RESERVED) - (batch->ptr - batch->buffer); return (BATCH_SZ - BATCH_RESERVED) - (batch->ptr - batch->buffer);

2
lib/intel_gpu_tools.h
View File

@ -74,7 +74,7 @@ struct intel_register_map {
uint32_t alignment_mask; uint32_t alignment_mask;
}; };
struct intel_register_map intel_get_register_map(uint32_t devid); 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, int mode); struct intel_register_range *intel_get_register_range(struct intel_register_map map, uint32_t offset, uint32_t mode);
static inline uint32_t static inline uint32_t

4
lib/intel_reg_map.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright © 2011 Intel Corporation * Copyright © 2011 Intel Corporation
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -151,7 +151,7 @@ intel_get_register_map(uint32_t devid)
} }
struct intel_register_range * struct intel_register_range *
intel_get_register_range(struct intel_register_map map, uint32_t offset, int mode) intel_get_register_range(struct intel_register_map map, uint32_t offset, uint32_t mode)
{ {
struct intel_register_range *range = map.map; struct intel_register_range *range = map.map;
uint32_t align = map.alignment_mask; uint32_t align = map.alignment_mask;