Module Name: xsrc
Committed By: mrg
Date: Sun Nov 1 10:01:30 UTC 2020
Modified Files:
xsrc/external/mit/libdrm/dist: util_math.h xf86drm.c
Log Message:
fix build cornflakes from libdrm 2.4.102.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/util_math.h
cvs rdiff -u -r1.26 -r1.27 xsrc/external/mit/libdrm/dist/xf86drm.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/util_math.h
diff -u xsrc/external/mit/libdrm/dist/util_math.h:1.2 xsrc/external/mit/libdrm/dist/util_math.h:1.3
--- xsrc/external/mit/libdrm/dist/util_math.h:1.2 Sun Jan 21 21:49:51 2018
+++ xsrc/external/mit/libdrm/dist/util_math.h Sun Nov 1 10:01:30 2020
@@ -29,6 +29,7 @@
#define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))
#define __align_mask(value, mask) (((value) + (mask)) & ~(mask))
+#undef ALIGN
#define ALIGN(value, alignment) __align_mask(value, (__typeof__(value))((alignment) - 1))
#endif /*_UTIL_MATH_H_*/
Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.26 xsrc/external/mit/libdrm/dist/xf86drm.c:1.27
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.26 Sun Nov 1 09:57:37 2020
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Sun Nov 1 10:01:30 2020
@@ -3132,7 +3132,7 @@ static int drmParseSubsystemType(int maj
int ret;
/* Get the type of device we're looking for to pick the right pathname. */
- type = drmGetMinorType(min);
+ type = drmGetMinorType(maj, min);
if (type == -1)
return -ENODEV;
@@ -3302,7 +3302,7 @@ static int drmParsePciBusInfo(int maj, i
int ret;
/* Get the type of device we're looking for to pick the right pathname. */
- type = drmGetMinorType(min);
+ type = drmGetMinorType(maj, min);
if (type == -1)
return -ENODEV;
