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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
diff ... libdrm-2.4.74/xf86drm.c
--- libdrm-2.4.74-ref/xf86drm.c Tue Nov 29 06:15:10 2016
+++ libdrm-2.4.74/xf86drm.c Sat Dec 31 19:13:57 2016
@@ -98,6 +98,11 @@
#endif
#endif /* __OpenBSD__ */
+#if defined(__sun)
+/* Device majors are dynamic. */
+#define DRM_MAJOR (_sun_drm_get_major())
+#endif /* __sun */
+
#ifndef DRM_MAJOR
#define DRM_MAJOR 226 /* Linux */
#endif
@@ -349,9 +354,14 @@
if (stat(DRM_DIR_NAME, &st)) {
if (!isroot)
return DRM_ERR_NOT_ROOT;
+#if defined(__sun)
+ /* Let the system do this. */
+ return DRM_ERR_NO_DEVICE;
+#else
mkdir(DRM_DIR_NAME, DRM_DEV_DIRMODE);
chown_check_return(DRM_DIR_NAME, 0, 0); /* root:root */
chmod(DRM_DIR_NAME, DRM_DEV_DIRMODE);
+#endif
}
/* Check if the device node exists and create it if necessary. */
@@ -358,8 +368,13 @@
if (stat(buf, &st)) {
if (!isroot)
return DRM_ERR_NOT_ROOT;
+#if defined(__sun)
+ /* Let the system do this. */
+ return DRM_ERR_NO_DEVICE;
+#else
remove(buf);
mknod(buf, S_IFCHR | devmode, dev);
+#endif
}
if (drm_server_info && drm_server_info->get_perms) {
@@ -405,6 +420,10 @@
if (st.st_rdev != dev) {
if (!isroot)
return DRM_ERR_NOT_ROOT;
+#if defined(__sun)
+ /* Let the system do this. */
+ return DRM_ERR_NO_DEVICE;
+#else
remove(buf);
mknod(buf, S_IFCHR | devmode, dev);
if (drm_server_info && drm_server_info->get_perms) {
@@ -411,6 +430,7 @@
chown_check_return(buf, user, group);
chmod(buf, devmode);
}
+#endif
}
fd = open(buf, O_RDWR, 0);
drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@@ -532,6 +552,7 @@
}
}
+#ifndef __sun /* Avoid "static unused" warning */
static const char *drmGetMinorName(int type)
{
switch (type) {
@@ -545,6 +566,7 @@
return NULL;
}
}
+#endif /* __sun */
/**
* Open the device by bus ID.
@@ -1108,7 +1130,7 @@
drm_map_t map;
memclear(map);
- map.handle = (void *)(uintptr_t)handle;
+ map.handle = (drm_handle_t)(uintptr_t)handle;
if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
return -errno;
@@ -2696,6 +2718,15 @@
fstat(fd, &sbuf);
d = sbuf.st_rdev;
+#if defined(__sun)
+ /*
+ * Get rid of clone-open bits in the minor number.
+ * See: the drm driver drm_sun_open()
+ * Don't have DRM_CLONEID_NBITS here.
+ */
+ d &= ~0x3fe00;
+#endif
+
for (i = 0; i < DRM_MAX_MINOR; i++) {
snprintf(name, sizeof name, DRM_DEV_NAME, DRM_DIR_NAME, i);
if (stat(name, &sbuf) == 0 && sbuf.st_rdev == d)
@@ -2761,6 +2792,10 @@
return 0;
}
+#ifdef __sun /* OS-dependent */
+#define drmGetMinorNameForFD(fd, t) \
+ _sun_drmGetMinorNameForFD(fd, t)
+#else /* __sun */
static char *drmGetMinorNameForFD(int fd, int type)
{
#ifdef __linux__
@@ -2822,6 +2857,7 @@
#endif
return NULL;
}
+#endif /* __sun */
char *drmGetPrimaryDeviceNameFromFd(int fd)
{
@@ -2833,6 +2869,10 @@
return drmGetMinorNameForFD(fd, DRM_NODE_RENDER);
}
+#ifdef __sun /* OS-dependent */
+#define drmParseSubsystemType(ma, mi) \
+ _sun_drmParseSubsystemType(ma, mi)
+#else /* __sun */
static int drmParseSubsystemType(int maj, int min)
{
#ifdef __linux__
@@ -2859,7 +2899,12 @@
return -EINVAL;
#endif
}
+#endif /* __sun */
+#ifdef __sun /* OS-dependent */
+#define drmParsePciBusInfo(ma, mi, inf) \
+ _sun_drmParsePciBusInfo(ma, mi, inf)
+#else /* __sun */
static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
{
#ifdef __linux__
@@ -2901,6 +2946,7 @@
return -EINVAL;
#endif
}
+#endif /* __sun */
static int drmCompareBusInfo(drmDevicePtr a, drmDevicePtr b)
{
@@ -2946,6 +2992,10 @@
3 /* length of the node number */;
}
+#ifdef __sun /* OS-dependent */
+#define drmParsePciDeviceInfo(name, dip) \
+ _sun_drmParsePciDeviceInfo(name, dip)
+#else /* __sun */
static int drmParsePciDeviceInfo(const char *d_name,
drmPciDeviceInfoPtr device)
{
@@ -2976,6 +3026,7 @@
return -EINVAL;
#endif
}
+#endif /* __sun */
void drmFreeDevice(drmDevicePtr *device)
{
@@ -3349,6 +3400,8 @@
fclose(f);
return device_name;
+#elif defined(__sun)
+ return(_sun_drmGetMinorNameForFD(fd, -1));
#else
#warning "Missing implementation of drmGetDeviceNameFromFd2"
return NULL;
|
