| Message ID | 1421244471-31081-1-git-send-email-frank.binns@imgtec.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Ping On 14/01/15 14:07, Frank Binns wrote: > 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> > --- > tests/dristat.c | 2 +- > xf86drm.c | 10 +++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/dristat.c b/tests/dristat.c > index 4f2ee80..449aa24 100644 > --- a/tests/dristat.c > +++ b/tests/dristat.c > @@ -268,7 +268,7 @@ int main(int argc, char **argv) > > for (i = 0; i < 16; i++) if (!minor || i == minor) { > sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i); > - fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); > + fd = drmOpenMinor(i, 1, DRM_NODE_PRIMARY); > if (fd >= 0) { > printf("%s\n", buf); > if (mask & DRM_BUSID) getbusid(fd); > diff --git a/xf86drm.c b/xf86drm.c > index d900b4b..a23d029 100644 > --- a/xf86drm.c > +++ b/xf86drm.c > @@ -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); > } > } > }
On Wed, Jan 14, 2015 at 9:07 AM, Frank Binns <frank.binns@imgtec.com> wrote: > 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> looks reasonable.. for the series: Reviewed-by: Rob Clark <robdclark@gmail.com> > --- > tests/dristat.c | 2 +- > xf86drm.c | 10 +++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/dristat.c b/tests/dristat.c > index 4f2ee80..449aa24 100644 > --- a/tests/dristat.c > +++ b/tests/dristat.c > @@ -268,7 +268,7 @@ int main(int argc, char **argv) > > for (i = 0; i < 16; i++) if (!minor || i == minor) { > sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i); > - fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); > + fd = drmOpenMinor(i, 1, DRM_NODE_PRIMARY); > if (fd >= 0) { > printf("%s\n", buf); > if (mask & DRM_BUSID) getbusid(fd); > diff --git a/xf86drm.c b/xf86drm.c > index d900b4b..a23d029 100644 > --- a/xf86drm.c > +++ b/xf86drm.c > @@ -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); > } > } > } > -- > 1.8.5.4.gfdaaaa2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On 23/01/15 16:17, Frank Binns wrote: > Ping > Thanks for the patches and reminder Frank. I've pushed these to master with Rob's r-b. Cheers, Emil
diff --git a/tests/dristat.c b/tests/dristat.c index 4f2ee80..449aa24 100644 --- a/tests/dristat.c +++ b/tests/dristat.c @@ -268,7 +268,7 @@ int main(int argc, char **argv) for (i = 0; i < 16; i++) if (!minor || i == minor) { sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, i); - fd = drmOpenMinor(i, 1, DRM_NODE_RENDER); + fd = drmOpenMinor(i, 1, DRM_NODE_PRIMARY); if (fd >= 0) { printf("%s\n", buf); if (mask & DRM_BUSID) getbusid(fd); diff --git a/xf86drm.c b/xf86drm.c index d900b4b..a23d029 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -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); } } }
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> --- tests/dristat.c | 2 +- xf86drm.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)