diff options
| author | Frank Binns <frank.binns@imgtec.com> | 2015-01-14 14:07:50 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-01-23 23:02:06 +0000 |
| commit | ad8bbfd3c74466f088be8088d2d0524bed392b71 (patch) | |
| tree | d5e4cfc356ae2ae66a43eb7297550bff46127660 /xf86drm.c | |
| parent | d2e0f552467ca11162fe04dfed55de4590280f23 (diff) | |
Rename DRM_NODE_RENDER to DRM_NODE_PRIMARY
Now that there are render nodes it doesn't seem appropriate for the type of
the card nodes to be DRM_NODE_RENDER. For this reason, rename this type to
DRM_NODE_PRIMARY as this name better represents the purpose of these nodes.
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'xf86drm.c')
| -rw-r--r-- | xf86drm.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -86,7 +86,7 @@ #define DRM_MSG_VERBOSITY 3 #define DRM_NODE_CONTROL 0 -#define DRM_NODE_RENDER 1 +#define DRM_NODE_PRIMARY 1 static drmServerInfoPtr drm_server_info; @@ -444,7 +444,7 @@ int drmAvailable(void) int retval = 0; int fd; - if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) { + if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) { #ifdef __linux__ /* Try proc for backward Linux compatibility */ if (!access("/proc/dri/0", R_OK)) @@ -485,7 +485,7 @@ static int drmOpenByBusid(const char *busid) drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); for (i = 0; i < DRM_MAX_MINOR; i++) { - fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); + fd = drmOpenMinor(i, 1, DRM_NODE_PRIMARY); drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); if (fd >= 0) { /* We need to try for 1.4 first for proper PCI domain support @@ -547,7 +547,7 @@ static int drmOpenByName(const char *name) * already in use. If it's in use it will have a busid assigned already. */ for (i = 0; i < DRM_MAX_MINOR; i++) { - if ((fd = drmOpenMinor(i, 1, DRM_NODE_RENDER)) >= 0) { + if ((fd = drmOpenMinor(i, 1, DRM_NODE_PRIMARY)) >= 0) { if ((version = drmGetVersion(fd))) { if (!strcmp(version->name, name)) { drmFreeVersion(version); @@ -591,7 +591,7 @@ static int drmOpenByName(const char *name) if (*pt) { /* Found busid */ return drmOpenByBusid(++pt); } else { /* No busid */ - return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER); + return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_PRIMARY); } } } |