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

lib: add common min and max macros

Browse Source 
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2014-10-10 11:20:35 +01:00
parent d4e3b6a0f5
commit be4710a541
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/igt_aux.h
View File

@ -83,4 +83,8 @@ bool intel_check_memory(uint32_t count, uint32_t size, unsigned mode);
#define CHECK_RAM 0x1 #define CHECK_RAM 0x1
#define CHECK_SWAP 0x2 #define CHECK_SWAP 0x2
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) < (b) ? (a) : (b))
#endif /* IGT_AUX_H */ #endif /* IGT_AUX_H */

2
tests/eviction_common.c
View File

@ -170,8 +170,6 @@ static int swapping_evictions(int fd, struct igt_eviction_test_ops *ops,
return 0; return 0;
} }
#define min(a, b) ((a) < (b) ? (a) : (b))
static int forking_evictions(int fd, struct igt_eviction_test_ops *ops, static int forking_evictions(int fd, struct igt_eviction_test_ops *ops,
int surface_size, int working_surfaces, int surface_size, int working_surfaces,
int trash_surfaces, unsigned flags) int trash_surfaces, unsigned flags)

2
tests/gem_userptr_blits.c
View File

@ -981,8 +981,6 @@ static int can_swap(void)
return 1; return 1;
} }
#define min(a, b) ((a) < (b) ? (a) : (b))
static void test_forking_evictions(int fd, int size, int count, static void test_forking_evictions(int fd, int size, int count,
unsigned flags) unsigned flags)
{ {

8
tests/kms_flip.c
View File

@ -84,8 +84,6 @@
#define DRM_CAP_TIMESTAMP_MONOTONIC 6 #define DRM_CAP_TIMESTAMP_MONOTONIC 6
#endif #endif
#define max(a, b) ((a) > (b) ? (a) : (b))
drmModeRes *resources; drmModeRes *resources;
int drm_fd; int drm_fd;
static drm_intel_bufmgr *bufmgr; static drm_intel_bufmgr *bufmgr;
@ -925,7 +923,7 @@ static unsigned int run_test_step(struct test_output *o)
if (o->flags & TEST_PAN) { if (o->flags & TEST_PAN) {
int count = do_flip ? int count = do_flip ?
o->flip_state.count : o->vblank_state.count; o->flip_state.count : o->vblank_state.count;
int x_ofs = count * 10 > o->fb_width - o->kmode[0].hdisplay ? o->fb_width - o->kmode[0].hdisplay : count * 10; int x_ofs = min(count * 10, o->fb_width - o->kmode[0].hdisplay);
/* Make sure DSPSURF changes value */ /* Make sure DSPSURF changes value */
if (o->flags & TEST_HANG) if (o->flags & TEST_HANG)
@ -1396,7 +1394,7 @@ static int run_test(int duration, int flags)
igt_require(modes); igt_require(modes);
duration = duration * 1000 / modes; duration = duration * 1000 / modes;
duration = duration < 500 ? 500 : duration; duration = max(500, duration);
/* Find any connected displays */ /* Find any connected displays */
for (i = 0; i < resources->count_connectors; i++) { for (i = 0; i < resources->count_connectors; i++) {
@ -1460,7 +1458,7 @@ static int run_pair(int duration, int flags)
* configuration at all. So skip in that case. */ * configuration at all. So skip in that case. */
igt_require(modes); igt_require(modes);
duration = duration * 1000 / modes; duration = duration * 1000 / modes;
duration = duration < 500 ? 500 : duration; duration = max(duration, 500);
/* Find a pair of connected displays */ /* Find a pair of connected displays */
for (i = 0; i < resources->count_connectors; i++) { for (i = 0; i < resources->count_connectors; i++) {

4
tools/intel_display_poller.c
View File

@ -36,9 +36,7 @@
#include "intel_io.h" #include "intel_io.h"
#include "igt_debugfs.h" #include "igt_debugfs.h"
#include "drmtest.h" #include "drmtest.h"
#include "igt_aux.h"
#define min(a,b) ((a) < (b) ? (a) : (b))
#define max(a,b) ((a) > (b) ? (a) : (b))
enum test { enum test {
TEST_INVALID, TEST_INVALID,