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

flip_test: store the pipe id in the test context obj

Browse Source 
For DRM_IOCTL_WAIT_VBLANK we'll have to pass the pipe id - as opposed to
the crtc id required by the rest of the IOCTLs we use.

Thanks for Chris Wilson for pointing this out.

No functional change.

Signed-off-by: Imre Deak <imre.deak@intel.com>
This commit is contained in:
Imre Deak 2012-10-15 21:15:18 +03:00
parent 641261f4fe
commit 6c2b53d894
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/flip_test.c
View File

@ -90,6 +90,7 @@ struct test_output {
drmModeEncoder *encoder; drmModeEncoder *encoder;
drmModeConnector *connector; drmModeConnector *connector;
int crtc; int crtc;
int pipe;
int flags; int flags;
unsigned int current_fb_id; unsigned int current_fb_id;
unsigned int fb_width; unsigned int fb_width;
@ -601,6 +602,19 @@ static void flip_mode(struct test_output *o, int crtc, int duration)
drmModeFreeConnector(o->connector); drmModeFreeConnector(o->connector);
} }
static int get_pipe_from_crtc_id(int crtc_id)
{
struct drm_i915_get_pipe_from_crtc_id pfci;
int ret;
memset(&pfci, 0, sizeof(pfci));
pfci.crtc_id = crtc_id;
ret = drmIoctl(drm_fd, DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID, &pfci);
assert(ret == 0);
return pfci.pipe;
}
static int run_test(int duration, int flags) static int run_test(int duration, int flags)
{ {
struct test_output o; struct test_output o;
@ -616,12 +630,16 @@ static int run_test(int duration, int flags)
/* Find any connected displays */ /* Find any connected displays */
for (c = 0; c < resources->count_connectors; c++) { for (c = 0; c < resources->count_connectors; c++) {
for (i = 0; i < resources->count_crtcs; i++) { for (i = 0; i < resources->count_crtcs; i++) {
int crtc;
memset(&o, 0, sizeof(o)); memset(&o, 0, sizeof(o));
o.id = resources->connectors[c]; o.id = resources->connectors[c];
o.flags = flags; o.flags = flags;
o.flip_state.name = "flip"; o.flip_state.name = "flip";
crtc = resources->crtcs[i];
o.pipe = get_pipe_from_crtc_id(crtc);
flip_mode(&o, resources->crtcs[i], duration); flip_mode(&o, crtc, duration);
} }
} }