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

flip_test: factor out drmModePageFlip

Browse Source 
For better readability and to prepare for the upcoming patch marking
pending flip events with a flag.

No functional change.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Imre Deak 2012-10-16 17:34:41 +03:00 committed by Daniel Vetter
parent 43f6f873eb
commit f9f6bff80d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/flip_test.c
View File

@ -155,6 +155,12 @@ static int set_dpms(struct test_output *o, int mode)
return drmModeConnectorSetProperty(drm_fd, o->id, dpms, mode); return drmModeConnectorSetProperty(drm_fd, o->id, dpms, mode);
} }
static int do_page_flip(struct test_output *o, int fb_id)
{
return drmModePageFlip(drm_fd, o->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT,
o);
}
static bool static bool
analog_tv_connector(struct test_output *o) analog_tv_connector(struct test_output *o)
{ {
@ -218,8 +224,7 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec,
new_fb_id = o->fb_ids[o->current_fb_id]; new_fb_id = o->fb_ids[o->current_fb_id];
if (o->flags & TEST_EINVAL && o->count > 1) if (o->flags & TEST_EINVAL && o->count > 1)
assert(drmModePageFlip(drm_fd, o->crtc, new_fb_id, assert(do_page_flip(o, new_fb_id) == expected_einval);
DRM_MODE_PAGE_FLIP_EVENT, o) == expected_einval);
if (o->flags & TEST_MODESET) { if (o->flags & TEST_MODESET) {
if (drmModeSetCrtc(drm_fd, o->crtc, if (drmModeSetCrtc(drm_fd, o->crtc,
@ -238,12 +243,10 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec,
o->count++; o->count++;
printf("."); fflush(stdout); printf("."); fflush(stdout);
do_or_die(drmModePageFlip(drm_fd, o->crtc, new_fb_id, do_or_die(do_page_flip(o, new_fb_id));
DRM_MODE_PAGE_FLIP_EVENT, o));
if (o->flags & TEST_EBUSY) if (o->flags & TEST_EBUSY)
assert(drmModePageFlip(drm_fd, o->crtc, new_fb_id, assert(do_page_flip(o, new_fb_id) == -EBUSY);
DRM_MODE_PAGE_FLIP_EVENT, o) == -EBUSY);
if (o->flags & TEST_DPMS) if (o->flags & TEST_DPMS)
do_or_die(set_dpms(o, DRM_MODE_DPMS_OFF)); do_or_die(set_dpms(o, DRM_MODE_DPMS_OFF));
@ -260,8 +263,7 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec,
} }
if (o->flags & TEST_EINVAL) if (o->flags & TEST_EINVAL)
assert(drmModePageFlip(drm_fd, o->crtc, new_fb_id, assert(do_page_flip(o, new_fb_id) == expected_einval);
DRM_MODE_PAGE_FLIP_EVENT, o) == expected_einval);
o->last_flip_received = now; o->last_flip_received = now;
o->last_flip_ts = pageflip_ts; o->last_flip_ts = pageflip_ts;
@ -435,8 +437,7 @@ static void flip_mode(struct test_output *o, int crtc, int duration)
gettimeofday(&o->last_flip_received, NULL); gettimeofday(&o->last_flip_received, NULL);
if (drmModePageFlip(drm_fd, o->crtc, o->fb_ids[1], if (do_page_flip(o, o->fb_ids[1])) {
DRM_MODE_PAGE_FLIP_EVENT, o)) {
fprintf(stderr, "failed to page flip: %s\n", strerror(errno)); fprintf(stderr, "failed to page flip: %s\n", strerror(errno));
exit(4); exit(4);
} }