Module Name: xsrc
Committed By: riastradh
Date: Fri Apr 4 12:30:12 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drmMode.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Log Message:
Oops... Fix sense of test in drmCheckModesettingSupported.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.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.3 xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.4
--- xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.3 Sat Mar 22 02:20:29 2014
+++ xsrc/external/mit/libdrm/dist/xf86drmMode.c Fri Apr 4 12:30:11 2014
@@ -782,13 +782,13 @@ int drmCheckModesettingSupported(const c
fd = drmOpen(NULL, busid);
if (fd == -1)
return -EINVAL;
- if (drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
- ret = -errno;
- else
- ret = 0;
+ ret = drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res);
drmClose(fd);
- return ret;
+ if (ret == 0)
+ return 0;
#endif
+ return -ENOSYS;
+
}
int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
Index: xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
diff -u xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c:1.1.1.4 xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c:1.2
--- xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c:1.1.1.4 Mon Mar 17 07:51:43 2014
+++ xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c Fri Apr 4 12:30:11 2014
@@ -1195,6 +1195,17 @@ static void test_page_flip(struct device
#define min(a, b) ((a) < (b) ? (a) : (b))
+/* XXX local definition of GNUism for expedience */
+static char *
+strchrnul(const char *s, int c)
+{
+
+ while ((*s != c) && (*s != '\0'))
+ s++;
+
+ return __UNCONST(s);
+}
+
static int parse_connector(struct pipe_arg *pipe, const char *arg)
{
unsigned int len;
