All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH libdrm] Add new drmGetNodeTypeFromFd function
@ 2015-02-13 10:51 Frank Binns
  2015-02-13 16:38 ` Emil Velikov
  0 siblings, 1 reply; 4+ messages in thread
From: Frank Binns @ 2015-02-13 10:51 UTC (permalink / raw)
  To: dri-devel, emil.l.velikov; +Cc: rufus.hamade

Add a helper function that returns the type of device node from an fd.

Signed-off-by: Frank Binns <frank.binns@imgtec.com>
---
 xf86drm.c | 39 +++++++++++++++++++++++++++++++++++++++
 xf86drm.h |  1 +
 2 files changed, 40 insertions(+)

diff --git a/xf86drm.c b/xf86drm.c
index d85115c..e117bc6 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -505,6 +505,23 @@ static int drmGetMinorBase(int type)
     };
 }
 
+static int drmGetMinorType(int minor)
+{
+    int type = minor >> 6;
+
+    if (minor < 0)
+        return -1;
+
+    switch (type) {
+    case DRM_NODE_PRIMARY:
+    case DRM_NODE_CONTROL:
+    case DRM_NODE_RENDER:
+        return type;
+    default:
+        return -1;
+    }
+}
+
 /**
  * Open the device by bus ID.
  *
@@ -2667,6 +2684,28 @@ char *drmGetDeviceNameFromFd(int fd)
 	return strdup(name);
 }
 
+int drmGetNodeTypeFromFd(int fd)
+{
+	struct stat sbuf;
+	int maj, min, type;
+
+	if (fstat(fd, &sbuf))
+		return -1;
+
+	maj = major(sbuf.st_rdev);
+	min = minor(sbuf.st_rdev);
+
+	if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode)) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	type = drmGetMinorType(min);
+	if (type == -1)
+		errno = ENODEV;
+	return type;
+}
+
 int drmPrimeHandleToFD(int fd, uint32_t handle, uint32_t flags, int *prime_fd)
 {
 	struct drm_prime_handle args;
diff --git a/xf86drm.h b/xf86drm.h
index 77937eb..afd38a1 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -744,6 +744,7 @@ typedef struct _drmEventContext {
 extern int drmHandleEvent(int fd, drmEventContextPtr evctx);
 
 extern char *drmGetDeviceNameFromFd(int fd);
+extern int drmGetNodeTypeFromFd(int fd);
 
 extern int drmPrimeHandleToFD(int fd, uint32_t handle, uint32_t flags, int *prime_fd);
 extern int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle);
-- 
1.8.5.4.gfdaaaa2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH libdrm] Add new drmGetNodeTypeFromFd function
  2015-02-13 10:51 [PATCH libdrm] Add new drmGetNodeTypeFromFd function Frank Binns
@ 2015-02-13 16:38 ` Emil Velikov
  2015-02-17 16:10   ` Frank Binns
  0 siblings, 1 reply; 4+ messages in thread
From: Emil Velikov @ 2015-02-13 16:38 UTC (permalink / raw)
  To: Frank Binns, dri-devel; +Cc: rufus.hamade, emil.l.velikov

Hi Frank,
On 13/02/15 10:51, Frank Binns wrote:
> Add a helper function that returns the type of device node from an fd.
> 
> Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>

Thank you for getting rid of the silly file probing that I went with
initially.

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH libdrm] Add new drmGetNodeTypeFromFd function
  2015-02-13 16:38 ` Emil Velikov
@ 2015-02-17 16:10   ` Frank Binns
  2015-02-23  9:37     ` Emil Velikov
  0 siblings, 1 reply; 4+ messages in thread
From: Frank Binns @ 2015-02-17 16:10 UTC (permalink / raw)
  To: Emil Velikov, dri-devel; +Cc: rufus.hamade

Hi Emil,

On 13/02/15 16:38, Emil Velikov wrote:
> Hi Frank,
> On 13/02/15 10:51, Frank Binns wrote:
>> Add a helper function that returns the type of device node from an fd.
>>
>> Signed-off-by: Frank Binns <frank.binns@imgtec.com>
> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
>
> Thank you for getting rid of the silly file probing that I went with
> initially.
>
> -Emil

Would you mind pushing this as I don't have commit access.

Thanks
Frank
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH libdrm] Add new drmGetNodeTypeFromFd function
  2015-02-17 16:10   ` Frank Binns
@ 2015-02-23  9:37     ` Emil Velikov
  0 siblings, 0 replies; 4+ messages in thread
From: Emil Velikov @ 2015-02-23  9:37 UTC (permalink / raw)
  To: Frank Binns, dri-devel; +Cc: rufus.hamade, emil.l.velikov

On 17/02/15 16:10, Frank Binns wrote:
> Hi Emil,
> 
> On 13/02/15 16:38, Emil Velikov wrote:
>> Hi Frank,
>> On 13/02/15 10:51, Frank Binns wrote:
>>> Add a helper function that returns the type of device node from an fd.
>>>
>>> Signed-off-by: Frank Binns <frank.binns@imgtec.com>
>> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
>>
>> Thank you for getting rid of the silly file probing that I went with
>> initially.
>>
>> -Emil
> 
> Would you mind pushing this as I don't have commit access.
> 
Hi Frank,

Wanted to give some extra time for people to take a look and comment.
dri-devel has been quite busy lately :-)

Pushed to master, now let's respin the other helpers (using readdir_r).

Cheers,
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-02-23  9:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-13 10:51 [PATCH libdrm] Add new drmGetNodeTypeFromFd function Frank Binns
2015-02-13 16:38 ` Emil Velikov
2015-02-17 16:10   ` Frank Binns
2015-02-23  9:37     ` Emil Velikov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.