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

tests: Run lib/igt.cocci

Browse Source 
Found some open coded min()/max()/swap() macros.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2014-12-03 14:51:16 +02:00
parent e1bdab9973
commit 8032f526ef
5 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/drv_hangman.c
View File

@ -33,6 +33,7 @@
#include "intel_chipset.h" #include "intel_chipset.h"
#include "drmtest.h" #include "drmtest.h"
#include "igt_aux.h"
#include "igt_debugfs.h" #include "igt_debugfs.h"
#include "ioctl_wrappers.h" #include "ioctl_wrappers.h"
@ -117,8 +118,7 @@ static void read_dfs(const char *fname, char *d, int maxlen)
static void _assert_dfs_entry(const char *fname, const char *s, bool inverse) static void _assert_dfs_entry(const char *fname, const char *s, bool inverse)
{ {
char tmp[1024]; char tmp[1024];
const int l = strlen(s) < sizeof(tmp) ? const int l = min(strlen(s), sizeof(tmp));
strlen(s) : sizeof(tmp);
read_dfs(fname, tmp, l + 1); read_dfs(fname, tmp, l + 1);
if (!inverse) { if (!inverse) {

5
tests/eviction_common.c
View File

@ -54,11 +54,8 @@ struct igt_eviction_test_ops
static void exchange_uint32_t(void *array, unsigned i, unsigned j) static void exchange_uint32_t(void *array, unsigned i, unsigned j)
{ {
uint32_t *i_arr = array; uint32_t *i_arr = array;
uint32_t i_tmp;
i_tmp = i_arr[i]; swap(i_arr[i], i_arr[j]);
i_arr[i] = i_arr[j];
i_arr[j] = i_tmp;
} }
static int minor_evictions(int fd, struct igt_eviction_test_ops *ops, static int minor_evictions(int fd, struct igt_eviction_test_ops *ops,

5
tests/gem_seqno_wrap.c
View File

@ -171,11 +171,8 @@ static void render_copyfunc(struct igt_buf *src,
static void exchange_uint(void *array, unsigned i, unsigned j) static void exchange_uint(void *array, unsigned i, unsigned j)
{ {
unsigned *i_arr = array; unsigned *i_arr = array;
unsigned i_tmp;
i_tmp = i_arr[i]; swap(i_arr[i], i_arr[j]);
i_arr[i] = i_arr[j];
i_arr[j] = i_tmp;
} }
static void run_sync_test(int num_buffers, bool verify) static void run_sync_test(int num_buffers, bool verify)

7
tests/gem_stress.c
View File

@ -570,11 +570,8 @@ static void init_set(unsigned set)
static void exchange_uint(void *array, unsigned i, unsigned j) static void exchange_uint(void *array, unsigned i, unsigned j)
{ {
unsigned *i_arr = array; unsigned *i_arr = array;
unsigned i_tmp;
i_tmp = i_arr[i]; swap(i_arr[i], i_arr[j]);
i_arr[i] = i_arr[j];
i_arr[j] = i_tmp;
} }
static void copy_tiles(unsigned *permutation) static void copy_tiles(unsigned *permutation)
@ -741,7 +738,7 @@ static void init(void)
if (options.num_buffers == 0) { if (options.num_buffers == 0) {
tmp = gem_aperture_size(drm_fd); tmp = gem_aperture_size(drm_fd);
tmp = tmp > 256*(1024*1024) ? 256*(1024*1024) : tmp; tmp = min(256 * (1024 * 1024), tmp);
num_buffers = 2 * tmp / options.scratch_buf_size / 3; num_buffers = 2 * tmp / options.scratch_buf_size / 3;
num_buffers /= 2; num_buffers /= 2;
igt_info("using %u buffers\n", num_buffers); igt_info("using %u buffers\n", num_buffers);

12
tests/kms_flip.c
View File

@ -165,7 +165,7 @@ static unsigned long gettime_us(void)
static void emit_dummy_load__bcs(struct test_output *o) static void emit_dummy_load__bcs(struct test_output *o)
{ {
int i, limit; int i, limit;
drm_intel_bo *dummy_bo, *target_bo, *tmp_bo; drm_intel_bo *dummy_bo, *target_bo;
struct igt_fb *fb_info = &o->fb_info[o->current_fb_id]; struct igt_fb *fb_info = &o->fb_info[o->current_fb_id];
unsigned pitch = fb_info->stride; unsigned pitch = fb_info->stride;
@ -197,9 +197,7 @@ static void emit_dummy_load__bcs(struct test_output *o)
ADVANCE_BATCH(); ADVANCE_BATCH();
} }
tmp_bo = dummy_bo; swap(dummy_bo, target_bo);
dummy_bo = target_bo;
target_bo = tmp_bo;
} }
intel_batchbuffer_flush(batch); intel_batchbuffer_flush(batch);
@ -282,16 +280,12 @@ static void emit_dummy_load__rcs(struct test_output *o)
dst = &sb[1]; dst = &sb[1];
for (i = 0; i < limit; i++) { for (i = 0; i < limit; i++) {
struct igt_buf *tmp;
copyfunc(batch, NULL, copyfunc(batch, NULL,
src, 0, 0, src, 0, 0,
o->fb_width, o->fb_height, o->fb_width, o->fb_height,
dst, 0, 0); dst, 0, 0);
tmp = src; swap(src, dst);
src = dst;
dst = tmp;
} }
intel_batchbuffer_flush(batch); intel_batchbuffer_flush(batch);