summaryrefslogtreecommitdiff
path: root/usr/src/common/libdrm/patches/exynos.patch
blob: cff1c8f0c59353be8c0c6764e1e93842e3b9571f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
diff ... libdrm-2.4.73/exynos/exynos_drm.c
--- libdrm-2.4.73-ref/exynos/exynos_drm.c	Wed Aug 24 12:57:39 2016
+++ libdrm-2.4.73/exynos/exynos_drm.c	Sat Dec 31 12:27:53 2016
@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #include <sys/mman.h>
-#include <linux/stddef.h>
+#include <stddef.h>
 
 #include <xf86drm.h>
 
diff ... libdrm-2.4.73/exynos/exynos_fimg2d.c
--- libdrm-2.4.73-ref/exynos/exynos_fimg2d.c	Wed Aug 24 12:57:39 2016
+++ libdrm-2.4.73/exynos/exynos_fimg2d.c	Sat Dec 31 17:52:27 2016
@@ -21,7 +21,7 @@
 #include <assert.h>
 
 #include <sys/mman.h>
-#include <linux/stddef.h>
+#include <stddef.h>
 
 #include <xf86drm.h>
 
@@ -698,9 +698,10 @@
 	if (negative)
 		negative = 1;
 
-	if (src_w == dst_w && src_h == dst_h)
+	if (src_w == dst_w && src_h == dst_h) {
 		scale = 0;
-	else {
+		scale_x = scale_y = 0; /* GCC warnings */
+	} else {
 		scale = 1;
 		scale_x = g2d_get_scaling(src_w, dst_w);
 		scale_y = g2d_get_scaling(src_h, dst_h);
@@ -920,9 +921,10 @@
 	unsigned int scale, gem_space;
 	unsigned int scale_x, scale_y;
 
-	if (src_w == dst_w && src_h == dst_h)
+	if (src_w == dst_w && src_h == dst_h) {
 		scale = 0;
-	else {
+		scale_x = scale_y = 0; /* GCC warnings */
+	} else {
 		scale = 1;
 		scale_x = g2d_get_scaling(src_w, dst_w);
 		scale_y = g2d_get_scaling(src_h, dst_h);
diff ... libdrm-2.4.73/tests/exynos/exynos_fimg2d_test.c
--- libdrm-2.4.73-ref/tests/exynos/exynos_fimg2d_test.c	Wed Aug 24 12:57:39 2016
+++ libdrm-2.4.73/tests/exynos/exynos_fimg2d_test.c	Sat Dec 31 12:27:53 2016
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include <sys/mman.h>
-#include <linux/stddef.h>
+#include <stddef.h>
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>