Module Name: xsrc
Committed By: mrg
Date: Fri Jul 11 20:45:15 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drmMode.c
Log Message:
fix merge botch botch.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/xf86drmMode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86drmMode.c
diff -u xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.5 xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.6
--- xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.5 Fri Jul 11 19:57:33 2014
+++ xsrc/external/mit/libdrm/dist/xf86drmMode.c Fri Jul 11 20:45:15 2014
@@ -919,7 +919,7 @@ int drmModePageFlip(int fd, uint32_t crt
int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id,
uint32_t fb_id, uint32_t flags,
- int32_t crtc_x, int32_t crtc_y,
+ uint32_t crtc_x, uint32_t crtc_y,
uint32_t crtc_w, uint32_t crtc_h,
uint32_t src_x, uint32_t src_y,
uint32_t src_w, uint32_t src_h)
