summaryrefslogtreecommitdiff
path: root/libdrm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-12-18 19:18:21 +1100
committerDave Airlie <airlied@redhat.com>2007-12-18 19:18:21 +1100
commit629231c62675fe09f4eb948861a21980a9b79a5a (patch)
tree097ebcbb9f305fdac4cb3ebc15ef89bb8cea20fd /libdrm
parentea915c77e169a50ca7dc557512212eafa93e2205 (diff)
parent6d03411e5faa124bac014ebacec470ffd7cf2ce4 (diff)
Merge branch 'modesetting-airlied' into modesetting-101
Diffstat (limited to 'libdrm')
-rw-r--r--libdrm/xf86drmMode.c6
-rw-r--r--libdrm/xf86drmMode.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 726c55ab..0edb1d7d 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -328,6 +328,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
drmModeOutputPtr r = NULL;
out.output = output_id;
+ out.output_type_id = 0;
+ out.output_type = 0;
out.count_crtcs = 0;
out.crtcs = 0;
out.count_clones = 0;
@@ -372,8 +374,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
r->props = drmAllocCpy(U642VOID(out.props_ptr), out.count_props, sizeof(uint32_t));
r->prop_values = drmAllocCpy(U642VOID(out.prop_values_ptr), out.count_props, sizeof(uint64_t));
r->modes = drmAllocCpy(U642VOID(out.modes_ptr), out.count_modes, sizeof(struct drm_mode_modeinfo));
- strncpy(r->name, out.name, DRM_OUTPUT_NAME_LEN);
- r->name[DRM_OUTPUT_NAME_LEN-1] = 0;
+ r->output_type = out.output_type;
+ r->output_type_id = out.output_type_id;
err_allocs:
drmFree(U642VOID(out.prop_values_ptr));
diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 05b61bc8..e2dda8ac 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -125,7 +125,8 @@ typedef struct _drmModeOutput {
unsigned int output_id;
unsigned int crtc; /**< Crtc currently connected to */
- unsigned char name[DRM_OUTPUT_NAME_LEN];
+ unsigned int output_type;
+ unsigned int output_type_id;
drmModeConnection connection;
uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
drmModeSubPixel subpixel;