update patch for 2.4.114

This commit is contained in:
Dave Airlie 2022-11-10 06:06:13 +10:00
parent 5b985ebdd0
commit 684e271f18

View File

@ -1,7 +1,7 @@
diff -up libdrm-2.4.103/xf86drm.c.dma libdrm-2.4.103/xf86drm.c diff -up libdrm-2.4.114/xf86drm.c.dma libdrm-2.4.114/xf86drm.c
--- libdrm-2.4.103/xf86drm.c.dma 2020-11-04 13:24:14.000000000 +1000 --- libdrm-2.4.114/xf86drm.c.dma 2022-11-03 18:33:36.000000000 +1000
+++ libdrm-2.4.103/xf86drm.c 2020-11-04 13:42:04.190975193 +1000 +++ libdrm-2.4.114/xf86drm.c 2022-11-10 05:39:58.652477119 +1000
@@ -507,11 +507,6 @@ drm_public int drmAvailable(void) @@ -930,11 +930,6 @@ drm_public int drmAvailable(void)
int fd; int fd;
if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) { if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
@ -13,7 +13,7 @@ diff -up libdrm-2.4.103/xf86drm.c.dma libdrm-2.4.103/xf86drm.c
return 0; return 0;
} }
@@ -704,38 +699,6 @@ static int drmOpenByName(const char *nam @@ -1127,38 +1122,6 @@ static int drmOpenByName(const char *nam
} }
} }
@ -25,7 +25,7 @@ diff -up libdrm-2.4.103/xf86drm.c.dma libdrm-2.4.103/xf86drm.c
- int retcode; - int retcode;
- -
- sprintf(proc_name, "/proc/dri/%d/name", i); - sprintf(proc_name, "/proc/dri/%d/name", i);
- if ((fd = open(proc_name, O_RDONLY, 0)) >= 0) { - if ((fd = open(proc_name, O_RDONLY)) >= 0) {
- retcode = read(fd, buf, sizeof(buf)-1); - retcode = read(fd, buf, sizeof(buf)-1);
- close(fd); - close(fd);
- if (retcode) { - if (retcode) {