From d4f6c59a5e95ae879ee6559a763b00fe2b79337a Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 12 Jan 2012 12:06:53 -0200 Subject: [PATCH 1/9] modetest: fix some compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use unsigned int instead of int: - modetest.c:89:1: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] - modetest.c:97:1: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] - modetest.c:117:1: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] - modetest.c:772:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] The 'fd' variable is global, we don't need to pass it as an argument: - modetest.c:698:40: warning: unused parameter ‘fd’ [-Wunused-parameter] We don't use the 'modeset' variable: - modetest.c:725:8: warning: variable ‘modeset’ set but not used [-Wunused-but-set-variable] Signed-off-by: Paulo Zanoni --- tests/modetest/modetest.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 223adc41..9c0ef4ab 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -71,7 +71,7 @@ struct type_name { #define type_name_fn(res) \ char * res##_str(int type) { \ - int i; \ + unsigned int i; \ for (i = 0; i < ARRAY_SIZE(res##_names); i++) { \ if (res##_names[i].type == type) \ return res##_names[i].name; \ @@ -995,7 +995,7 @@ void usage(char *name) #define dump_resource(res) if (res) dump_##res() -static int page_flipping_supported(int fd) +static int page_flipping_supported(void) { /*FIXME: generic ioctl needed? */ return 1; @@ -1022,8 +1022,8 @@ int main(int argc, char **argv) int encoders = 0, connectors = 0, crtcs = 0, planes = 0, framebuffers = 0; int test_vsync = 0; char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm" }; - char *modeset = NULL; - int i, count = 0, plane_count = 0; + unsigned int i; + int count = 0, plane_count = 0; struct connector con_args[2]; struct plane plane_args[2] = {0}; @@ -1050,7 +1050,6 @@ int main(int argc, char **argv) test_vsync = 1; break; case 's': - modeset = strdup(optarg); con_args[count].crtc = -1; if (sscanf(optarg, "%d:%64s", &con_args[count].id, @@ -1096,7 +1095,7 @@ int main(int argc, char **argv) } } - if (test_vsync && !page_flipping_supported(fd)) { + if (test_vsync && !page_flipping_supported()) { fprintf(stderr, "page flipping not supported by drm.\n"); return -1; } From 64d0a81ecc467130ae825d5f13c215ad50b6cd39 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 12 Jan 2012 12:15:26 -0200 Subject: [PATCH 2/9] modetest: fix memory leak Don't "continue" without freeing the connector. 192 bytes in 6 blocks are indirectly lost in loss record 6 of 12 at 0x4C2779D: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4E30DD8: drmMalloc (xf86drm.c:147) by 0x4E35024: drmAllocCpy (xf86drmMode.c:73) by 0x4E35D69: drmModeGetConnector (xf86drmMode.c:507) by 0x402F22: dump_connectors (modetest.c:181) by 0x40261B: main (modetest.c:801) Signed-off-by: Paulo Zanoni --- tests/modetest/modetest.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 9c0ef4ab..1e55a016 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -199,17 +199,16 @@ void dump_connectors(void) printf("%s%d", j > 0 ? ", " : "", connector->encoders[j]); printf("\n"); - if (!connector->count_modes) - continue; - - printf(" modes:\n"); - printf(" name refresh (Hz) hdisp hss hse htot vdisp " - "vss vse vtot)\n"); - for (j = 0; j < connector->count_modes; j++) - dump_mode(&connector->modes[j]); - - printf(" props:\n"); - dump_props(connector); + if (connector->count_modes) { + printf(" modes:\n"); + printf(" name refresh (Hz) hdisp hss hse htot vdisp " + "vss vse vtot)\n"); + for (j = 0; j < connector->count_modes; j++) + dump_mode(&connector->modes[j]); + + printf(" props:\n"); + dump_props(connector); + } drmModeFreeConnector(connector); } From 0fb1f7a0fc2bd6a92d6ab96e08fd9474de9872bb Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 12 Jan 2012 14:21:56 -0200 Subject: [PATCH 3/9] modetest: print more about our properties In the future we'll have more than just connector properties, so create a dump_prop function that can handle any property (instead of the current dump_props function that only handles connector properties). Also, make this function print a lot more information about the existing properties. Also change the printed indentation of the modes to make the output more readable. The previous function dump_props also segfaulted when we didn't have enought permissions. The new function does not segfault in this case (by checking for the return value of drmModeGetProperty). Signed-off-by: Paulo Zanoni --- tests/modetest/modetest.c | 92 +++++++++++++++++++++++++++++++++++---- 1 file changed, 83 insertions(+), 9 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 1e55a016..7dc6e758 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -145,7 +146,7 @@ void dump_encoders(void) void dump_mode(drmModeModeInfo *mode) { - printf(" %s %d %d %d %d %d %d %d %d %d\n", + printf("\t%s %d %d %d %d %d %d %d %d %d\n", mode->name, mode->vrefresh, mode->hdisplay, @@ -159,16 +160,87 @@ void dump_mode(drmModeModeInfo *mode) } static void -dump_props(drmModeConnector *connector) +dump_blob(uint32_t blob_id) +{ + uint32_t i; + unsigned char *blob_data; + drmModePropertyBlobPtr blob; + + blob = drmModeGetPropertyBlob(fd, blob_id); + blob_data = blob->data; + + for (i = 0; i < blob->length; i++) { + if (i % 16 == 0) + printf("\n\t\t\t"); + printf("%.2hhx", blob_data[i]); + } + printf("\n"); + + drmModeFreePropertyBlob(blob); +} + +static void +dump_prop(uint32_t prop_id, uint64_t value) { - drmModePropertyPtr props; int i; + drmModePropertyPtr prop; + + prop = drmModeGetProperty(fd, prop_id); + + printf("\t%d", prop_id); + if (!prop) { + printf("\n"); + return; + } - for (i = 0; i < connector->count_props; i++) { - props = drmModeGetProperty(fd, connector->props[i]); - printf("\t%s, flags %d\n", props->name, props->flags); - drmModeFreeProperty(props); + printf(" %s:\n", prop->name); + + printf("\t\tflags:"); + if (prop->flags & DRM_MODE_PROP_PENDING) + printf(" pending"); + if (prop->flags & DRM_MODE_PROP_RANGE) + printf(" range"); + if (prop->flags & DRM_MODE_PROP_IMMUTABLE) + printf(" immutable"); + if (prop->flags & DRM_MODE_PROP_ENUM) + printf(" enum"); + if (prop->flags & DRM_MODE_PROP_BLOB) + printf(" blob"); + printf("\n"); + + if (prop->flags & DRM_MODE_PROP_RANGE) { + printf("\t\tvalues:"); + for (i = 0; i < prop->count_values; i++) + printf(" %"PRIu64, prop->values[i]); + printf("\n"); + } + + if (prop->flags & DRM_MODE_PROP_ENUM) { + printf("\t\tenums:"); + for (i = 0; i < prop->count_enums; i++) + printf(" %s=%llu", prop->enums[i].name, + prop->enums[i].value); + printf("\n"); + } else { + assert(prop->count_enums == 0); } + + if (prop->flags & DRM_MODE_PROP_BLOB) { + printf("\t\tblobs:\n"); + for (i = 0; i < prop->count_blobs; i++) + dump_blob(prop->blob_ids[i]); + printf("\n"); + } else { + assert(prop->count_blobs == 0); + } + + printf("\t\tvalue:"); + if (prop->flags & DRM_MODE_PROP_BLOB) + dump_blob(value); + else + printf(" %"PRIu64"\n", value); + + drmModeFreeProperty(prop); } void dump_connectors(void) @@ -201,13 +273,15 @@ void dump_connectors(void) if (connector->count_modes) { printf(" modes:\n"); - printf(" name refresh (Hz) hdisp hss hse htot vdisp " + printf("\tname refresh (Hz) hdisp hss hse htot vdisp " "vss vse vtot)\n"); for (j = 0; j < connector->count_modes; j++) dump_mode(&connector->modes[j]); printf(" props:\n"); - dump_props(connector); + for (j = 0; j < connector->count_props; j++) + dump_prop(connector->props[j], + connector->prop_values[j]); } drmModeFreeConnector(connector); From 968912faf75325e4dc81c17b3f7f2b1bdcb230bf Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 12 Jan 2012 14:35:42 -0200 Subject: [PATCH 4/9] Add support for generic object properties IOCTLs New library calls: - drmModeObjectGetProperties - drmModeFreeObjectProperties - drmModeObjectSetProperties Signed-off-by: Paulo Zanoni --- include/drm/drm.h | 2 + include/drm/drm_mode.h | 24 ++++++++++++ xf86drmMode.c | 83 ++++++++++++++++++++++++++++++++++++++++++ xf86drmMode.h | 14 +++++++ 4 files changed, 123 insertions(+) diff --git a/include/drm/drm.h b/include/drm/drm.h index 753d2fc8..5e6cd291 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -731,6 +731,8 @@ struct drm_prime_handle { #define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane) #define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane) #define DRM_IOCTL_MODE_ADDFB2 DRM_IOWR(0xB8, struct drm_mode_fb_cmd2) +#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct drm_mode_obj_get_properties) +#define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct drm_mode_obj_set_property) /** * Device specific ioctls should only be in their respective headers diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index f36c61a5..f303d94c 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -250,6 +250,30 @@ struct drm_mode_connector_set_property { __u32 connector_id; }; +#define DRM_MODE_OBJECT_CRTC 0xcccccccc +#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0 +#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0 +#define DRM_MODE_OBJECT_MODE 0xdededede +#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0 +#define DRM_MODE_OBJECT_FB 0xfbfbfbfb +#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb +#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee + +struct drm_mode_obj_get_properties { + __u64 props_ptr; + __u64 prop_values_ptr; + __u32 count_props; + __u32 obj_id; + __u32 obj_type; +}; + +struct drm_mode_obj_set_property { + __u64 value; + __u32 prop_id; + __u32 obj_id; + __u32 obj_type; +}; + struct drm_mode_get_blob { __u32 blob_id; __u32 length; diff --git a/xf86drmMode.c b/xf86drmMode.c index c809c44a..a60c7cb1 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -974,3 +974,86 @@ void drmModeFreePlaneResources(drmModePlaneResPtr ptr) drmFree(ptr->planes); drmFree(ptr); } + +drmModeObjectPropertiesPtr drmModeObjectGetProperties(int fd, + uint32_t object_id, + uint32_t object_type) +{ + struct drm_mode_obj_get_properties properties; + drmModeObjectPropertiesPtr ret = NULL; + uint32_t count; + +retry: + memset(&properties, 0, sizeof(struct drm_mode_obj_get_properties)); + properties.obj_id = object_id; + properties.obj_type = object_type; + + if (drmIoctl(fd, DRM_IOCTL_MODE_OBJ_GETPROPERTIES, &properties)) + return 0; + + count = properties.count_props; + + if (count) { + properties.props_ptr = VOID2U64(drmMalloc(count * + sizeof(uint32_t))); + if (!properties.props_ptr) + goto err_allocs; + properties.prop_values_ptr = VOID2U64(drmMalloc(count * + sizeof(uint64_t))); + if (!properties.prop_values_ptr) + goto err_allocs; + } + + if (drmIoctl(fd, DRM_IOCTL_MODE_OBJ_GETPROPERTIES, &properties)) + goto err_allocs; + + if (count < properties.count_props) { + drmFree(U642VOID(properties.props_ptr)); + drmFree(U642VOID(properties.prop_values_ptr)); + goto retry; + } + count = properties.count_props; + + ret = drmMalloc(sizeof(*ret)); + if (!ret) + goto err_allocs; + + ret->count_props = count; + ret->props = drmAllocCpy(U642VOID(properties.props_ptr), + count, sizeof(uint32_t)); + ret->prop_values = drmAllocCpy(U642VOID(properties.prop_values_ptr), + count, sizeof(uint64_t)); + if (ret->count_props && (!ret->props || !ret->prop_values)) { + drmFree(ret->props); + drmFree(ret->prop_values); + drmFree(ret); + ret = NULL; + } + +err_allocs: + drmFree(U642VOID(properties.props_ptr)); + drmFree(U642VOID(properties.prop_values_ptr)); + return ret; +} + +void drmModeFreeObjectProperties(drmModeObjectPropertiesPtr ptr) +{ + if (!ptr) + return; + drmFree(ptr->props); + drmFree(ptr->prop_values); + drmFree(ptr); +} + +int drmModeObjectSetProperty(int fd, uint32_t object_id, uint32_t object_type, + uint32_t property_id, uint64_t value) +{ + struct drm_mode_obj_set_property prop; + + prop.value = value; + prop.prop_id = property_id; + prop.obj_id = object_id; + prop.obj_type = object_type; + + return DRM_IOCTL(fd, DRM_IOCTL_MODE_OBJ_SETPROPERTY, &prop); +} diff --git a/xf86drmMode.h b/xf86drmMode.h index 991e3f94..8e400340 100644 --- a/xf86drmMode.h +++ b/xf86drmMode.h @@ -281,6 +281,12 @@ typedef struct _drmModeConnector { uint32_t *encoders; /**< List of encoder ids */ } drmModeConnector, *drmModeConnectorPtr; +typedef struct _drmModeObjectProperties { + uint32_t count_props; + uint32_t *props; + uint64_t *prop_values; +} drmModeObjectProperties, *drmModeObjectPropertiesPtr; + typedef struct _drmModePlane { uint32_t count_formats; uint32_t *formats; @@ -428,6 +434,14 @@ extern int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h); +extern drmModeObjectPropertiesPtr drmModeObjectGetProperties(int fd, + uint32_t object_id, + uint32_t object_type); +extern void drmModeFreeObjectProperties(drmModeObjectPropertiesPtr ptr); +extern int drmModeObjectSetProperty(int fd, uint32_t object_id, + uint32_t object_type, uint32_t property_id, + uint64_t value); + #if defined(__cplusplus) || defined(c_plusplus) } #endif From b5c60192c9133a4cb5a01cee80b040775c494a61 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Thu, 12 Jan 2012 14:45:25 -0200 Subject: [PATCH 5/9] modetest: print CRTC properties Signed-off-by: Paulo Zanoni --- tests/modetest/modetest.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 7dc6e758..d411dcbe 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -292,7 +292,9 @@ void dump_connectors(void) void dump_crtcs(void) { drmModeCrtc *crtc; + drmModeObjectPropertiesPtr props; int i; + uint32_t j; printf("CRTCs:\n"); printf("id\tfb\tpos\tsize\n"); @@ -311,6 +313,19 @@ void dump_crtcs(void) crtc->width, crtc->height); dump_mode(&crtc->mode); + printf(" props:\n"); + props = drmModeObjectGetProperties(fd, crtc->crtc_id, + DRM_MODE_OBJECT_CRTC); + if (props) { + for (j = 0; j < props->count_props; j++) + dump_prop(props->props[j], + props->prop_values[j]); + drmModeFreeObjectProperties(props); + } else { + printf("\tcould not get crtc properties: %s\n", + strerror(errno)); + } + drmModeFreeCrtc(crtc); } printf("\n"); From 3647473bf1ad13e91dd7caacd0e2db6b5959e31f Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 30 Mar 2012 14:55:02 -0500 Subject: [PATCH 6/9] Add support for bitmask properties --- include/drm/drm_mode.h | 1 + xf86drmMode.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index f303d94c..62ba997f 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -226,6 +226,7 @@ struct drm_mode_get_connector { #define DRM_MODE_PROP_IMMUTABLE (1<<2) #define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */ #define DRM_MODE_PROP_BLOB (1<<4) +#define DRM_MODE_PROP_BITMASK (1<<5) /* bitmask of enumerated types */ struct drm_mode_property_enum { __u64 value; diff --git a/xf86drmMode.c b/xf86drmMode.c index a60c7cb1..04fdf1ff 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -575,7 +575,7 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id) if (prop.count_values) prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t))); - if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_ENUM)) + if (prop.count_enum_blobs && (prop.flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK))) prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum))); if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_BLOB)) { @@ -597,7 +597,7 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id) r->flags = prop.flags; if (prop.count_values) r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t)); - if (prop.flags & DRM_MODE_PROP_ENUM) { + if (prop.flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) { r->count_enums = prop.count_enum_blobs; r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum)); } else if (prop.flags & DRM_MODE_PROP_BLOB) { From 99afbcf09caec321d467dcda0b3f3c84d2d565d0 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 30 Mar 2012 14:57:14 -0500 Subject: [PATCH 7/9] modetest: support bitmask properties --- tests/modetest/modetest.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index d411dcbe..efb375db 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -204,6 +204,8 @@ dump_prop(uint32_t prop_id, uint64_t value) printf(" immutable"); if (prop->flags & DRM_MODE_PROP_ENUM) printf(" enum"); + if (prop->flags & DRM_MODE_PROP_BITMASK) + printf(" bitmask"); if (prop->flags & DRM_MODE_PROP_BLOB) printf(" blob"); printf("\n"); @@ -221,6 +223,12 @@ dump_prop(uint32_t prop_id, uint64_t value) printf(" %s=%llu", prop->enums[i].name, prop->enums[i].value); printf("\n"); + } else if (prop->flags & DRM_MODE_PROP_BITMASK) { + printf("\t\tvalues:"); + for (i = 0; i < prop->count_enums; i++) + printf(" %s=0x%llx", prop->enums[i].name, + (1LL << prop->enums[i].value)); + printf("\n"); } else { assert(prop->count_enums == 0); } From a6c82f816dadaf0e4d0c628857977665b21a2481 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 30 Mar 2012 14:57:33 -0500 Subject: [PATCH 8/9] modetest: support plane properties --- tests/modetest/modetest.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index efb375db..b7b0eb15 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -366,6 +366,7 @@ void dump_framebuffers(void) static void dump_planes(void) { + drmModeObjectPropertiesPtr props; drmModePlaneRes *plane_resources; drmModePlane *ovr; int i, j; @@ -400,6 +401,19 @@ static void dump_planes(void) printf(" %4.4s", (char *)&ovr->formats[j]); printf("\n"); + printf(" props:\n"); + props = drmModeObjectGetProperties(fd, ovr->plane_id, + DRM_MODE_OBJECT_PLANE); + if (props) { + for (j = 0; j < props->count_props; j++) + dump_prop(props->props[j], + props->prop_values[j]); + drmModeFreeObjectProperties(props); + } else { + printf("\tcould not get plane properties: %s\n", + strerror(errno)); + } + drmModeFreePlane(ovr); } printf("\n"); From 64ed3d7d655f0dda2e9ab454b41d94beb99c3bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 10 May 2012 10:24:40 +0200 Subject: [PATCH 9/9] Add omapdrm module to kmstest and vbltest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Vincent Stehlé --- tests/kmstest/main.c | 1 + tests/vbltest/vbltest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c index 5df0a383..f2e14d38 100644 --- a/tests/kmstest/main.c +++ b/tests/kmstest/main.c @@ -61,6 +61,7 @@ char *drivers[] = { "radeon", "nouveau", "vmwgfx", + "omapdrm", NULL }; diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c index 903ca0f4..30ba498d 100644 --- a/tests/vbltest/vbltest.c +++ b/tests/vbltest/vbltest.c @@ -103,7 +103,7 @@ static void usage(char *name) int main(int argc, char **argv) { int i, c, fd, ret; - char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx" }; + char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm" }; drmVBlank vbl; drmEventContext evctx; struct vbl_info handler_info;