diff options
Diffstat (limited to 'xf86drmMode.c')
-rw-r--r-- | xf86drmMode.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
575 | if (prop.count_values) | 575 | if (prop.count_values) |
576 | prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t))); | 576 | prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t))); |
577 | 577 | ||
578 | if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_ENUM)) | 578 | if (prop.count_enum_blobs && (prop.flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK))) |
579 | prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum))); | 579 | prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum))); |
580 | 580 | ||
581 | if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_BLOB)) { | 581 | if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_BLOB)) { |
@@ -597,7 +597,7 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id) | |||
597 | r->flags = prop.flags; | 597 | r->flags = prop.flags; |
598 | if (prop.count_values) | 598 | if (prop.count_values) |
599 | r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t)); | 599 | r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t)); |
600 | if (prop.flags & DRM_MODE_PROP_ENUM) { | 600 | if (prop.flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) { |
601 | r->count_enums = prop.count_enum_blobs; | 601 | r->count_enums = prop.count_enum_blobs; |
602 | r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum)); | 602 | r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum)); |
603 | } else if (prop.flags & DRM_MODE_PROP_BLOB) { | 603 | } else if (prop.flags & DRM_MODE_PROP_BLOB) { |