diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-15 18:31:50 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-15 18:31:50 +1100 |
| commit | f32688d3d011d631c18d584603d684edd9b9b512 (patch) | |
| tree | c5f9b151a16ca97e4253500595487ef4dcd60074 | |
| parent | 1e8984a3674c89c3b5ef9b6d3747fb75e10774b3 (diff) | |
libdrm: add crtc/output ids to userspace interface
| -rw-r--r-- | libdrm/xf86drmMode.c | 4 | ||||
| -rw-r--r-- | libdrm/xf86drmMode.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c index e7ac58ba..c3abb2df 100644 --- a/libdrm/xf86drmMode.c +++ b/libdrm/xf86drmMode.c @@ -265,7 +265,8 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId) if (!(r = drmMalloc(sizeof(*r)))) return 0; - + + r->crtc_id = crtc.crtc_id; r->x = crtc.x; r->y = crtc.y; r->mode = crtc.mode; @@ -337,6 +338,7 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id) if(!(r = drmMalloc(sizeof(*r)))) return 0; + r->output_id = out.output; r->connection = out.connection; r->mmWidth = out.mm_width; r->mmHeight = out.mm_height; diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h index b25a6610..be9d84af 100644 --- a/libdrm/xf86drmMode.h +++ b/libdrm/xf86drmMode.h @@ -71,7 +71,7 @@ typedef struct _drmModeRes { typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr; typedef struct _drmModeCrtc { - + unsigned int crtc_id; unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/ uint32_t x, y; /**< Position on the frameuffer */ @@ -104,6 +104,7 @@ typedef enum { } drmModeSubPixel; typedef struct _drmModeOutput { + unsigned int output_id; unsigned int crtc; /**< Crtc currently connected to */ unsigned char name[DRM_OUTPUT_NAME_LEN]; |