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

tests/drm_read: Drop DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID

Browse Source 
So the test runs on other drivers, drop the usage of the i915-specific
DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID ioctl.

Wait for a vblank event on pipe0 and if we get it, then the test can
proceed (code copied from kms_vblank).

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
This commit is contained in:
Tomeu Vizoso 2016-02-26 09:55:48 +01:00
parent 90a7e3bae5
commit a8be527172
1 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/drm_read.c
View File

@ -175,46 +175,12 @@ static void test_short_buffer(int in, int nonblock)
teardown(fd); teardown(fd);
} }
static int pipe0_enabled(int fd) static bool crtc0_active(int fd)
{ {
struct drm_mode_card_res res; union drm_wait_vblank vbl = {};
uint32_t crtcs[32];
int i;
/* We assume we can generate events on pipe 0. So we have better vbl.request.type = DRM_VBLANK_RELATIVE;
* make sure that is running! return drmIoctl(fd, DRM_IOCTL_WAIT_VBLANK, &vbl) == 0;
*/
memset(&res, 0, sizeof(res));
res.count_crtcs = 32;
res.crtc_id_ptr = (uintptr_t)crtcs;
if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
return 0;
if (res.count_crtcs > 32)
return 0;
for (i = 0; i < res.count_crtcs; i++) {
struct drm_i915_get_pipe_from_crtc_id get_pipe;
struct drm_mode_crtc mode;
memset(&get_pipe, 0, sizeof(get_pipe));
memset(&mode, 0, sizeof(mode));
mode.crtc_id = crtcs[i];
get_pipe.pipe = -1;
get_pipe.crtc_id = mode.crtc_id;
drmIoctl(fd, DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID, &get_pipe);
if (get_pipe.pipe)
continue;
drmIoctl(fd, DRM_IOCTL_MODE_GETCRTC, &mode);
return mode.mode_valid && mode.mode.clock;
}
return 0;
} }
igt_main igt_main
@ -226,7 +192,7 @@ igt_main
igt_fixture { igt_fixture {
fd = drm_open_driver_master(DRIVER_ANY); fd = drm_open_driver_master(DRIVER_ANY);
igt_require(pipe0_enabled(fd)); igt_require(crtc0_active(fd));
} }
igt_subtest("invalid-buffer") igt_subtest("invalid-buffer")