diff mbox

Move wayland-drm protocol from Mesa to wayland-core

Message ID CA+M3ks6bCaEWwqCMU7d2Yem66CWD6F97UMyQPxcasO9yAfJ22g@mail.gmail.com
State New
Headers show

Commit Message

Benjamin Gaignard Nov. 28, 2013, 9:24 a.m. UTC 
Jason,

From my point of view wl_drm isn't link to Mesa, it is only about
exchange buffers by using a file descriptor and, for example, doesn't
rely on EGL.

I understand that other graphic stacks could have defined their own
way to for zero-copy (and so other protocols).
I don't aim to make gstreamer wayland sink works for all of them but
at least with wl_drm protocol which is quite generic.

Since dmabuf has been adopted in kernel we have the opportunity to
rationalize also some code in userland and for that we need a common
wayland protocol.
Move wl_drm into wayland-core make it more easily accessible for all
software even for those who don't use Mesa.

Benjamin

PS: I have an updated version of my patch for latest wayland


2013/11/27 Jasper St. Pierre <jstpierre@mecheye.net>:
> Wasn't EGLStreams supposed to solve the use case of passing hardware buffers
> around in a standard way?
>
>
> On Wed, Nov 27, 2013 at 1:22 PM, Jason Ekstrand <jason@jlekstrand.net>
> wrote:
>>
>>
>> On Nov 27, 2013 10:53 AM, "Benjamin Gaignard"
>> <benjamin.gaignard@linaro.org> wrote:
>> >
>> > Hi all,
>> >
>> > I'm working for Linaro on enabling a zero copy path in GStreamer by
>> > using dmabuf.
>> > To make this possible I have patched gst wayland sink to use wayland
>> > drm protocol: https://bugzilla.gnome.org/show_bug.cgi?id=711155
>> >
>> > Today wayland drm protocol is limited to Mesa so I have decided to
>> > move it into wayland-core.
>> > My hardware doesn't have gpu support yet so I have patched weston
>> > (pixman) to allow usage of wl_drm buffers.
>> > With this I able to share/use a buffer allocated by DRM in gstreamer
>> > pipeline even if I don't have gpu and EGL.
>> >
>> > What do you think about make wayland drm protocol available like this ?
>>
>> Benjamin,
>>
>> The problem here is that wl_drm is really a mesa extension.  Well, more of
>> an open-source linux graphics stack extension.  The point is that there are
>> other graphics stacks: Rhaspberry Pi, libhybris, other proprietary stacks,
>> etc.  and each of these graphics stacks has its own extension for passing
>> hardware buffers around.  This means that if you want your GStreamer sink to
>> work on these other stacks with zero-copy, you will have to talk their
>> protocols.  Because wl_drm isn't global to all of wayland, it probably
>> shouldn't go into the wayland core.
>>
>> This does not mean, however, that wl_drm can't be exposed in a more
>> sensible way.  As of 1.3, we are now exporting wayland.xml to
>> /usr/share/wayland and we can put other extensions there as well.  We could
>> have, for instance, a /usr/share/mesa.xml file that provides the mesa
>> extensions.  Then projects wanting to talk directly to mesa can generate the
>> header and C files from the system-installed xml file.  This would solve the
>> problem of keeping everything in sync.
>>
>> One last note (this one's been bugging me for a while).  If we are going
>> to export wl_drm in some way, we should probably rename it to something like
>> mesa_drm.  We really need to get out of the habit of using the wl_ namespace
>> for everything that talks the wayland protocol.  If we don't alter the
>> details of wl_drm in the rename, it shouldn't be too hard to move everyone
>> over from wl_drm to mesa_drm.
>>
>> Hope that's sensible/helpful.
>> --Jason Ekstrand
>>
>>
>> _______________________________________________
>> wayland-devel mailing list
>> wayland-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>>
>
>
>
> --
>   Jasper

Comments

Pekka Paalanen Nov. 28, 2013, 10:04 a.m. UTC | #1 
On Thu, 28 Nov 2013 10:24:33 +0100
Benjamin Gaignard <benjamin.gaignard@linaro.org> wrote:

> Jason,
> 
> From my point of view wl_drm isn't link to Mesa, it is only about
> exchange buffers by using a file descriptor and, for example, doesn't
> rely on EGL.
> 
> I understand that other graphic stacks could have defined their own
> way to for zero-copy (and so other protocols).
> I don't aim to make gstreamer wayland sink works for all of them but
> at least with wl_drm protocol which is quite generic.
> 
> Since dmabuf has been adopted in kernel we have the opportunity to
> rationalize also some code in userland and for that we need a common
> wayland protocol.
> Move wl_drm into wayland-core make it more easily accessible for all
> software even for those who don't use Mesa.

Hi,

if you aim particularly for dma-buf, then I would propose making a new
Wayland protocol extension mesa_dma_buf or gbm_dma_buf or whatever name
is appropriate, and drop all the unneeded parts compared to wl_drm.

I think dma-buf with render nodes will not need authentication, and it
certainly does not use flink names. Would that work?

Note that still it would not be about a generic fd-based buffer
passing but specifically dma-buf. If you want it really generic, then
you would need something like Android's native_buffer_t (IIRC) which
contains an arbitrary number of fds and integers, and then you are
going to need platform-specific code to handle them right and whooops,
the protocol itself is not meaningful anymore.

You might be interested in
http://lists.freedesktop.org/archives/wayland-devel/2013-October/011593.html
which is David Herrmann's proof of concept for passing mmappable
dmabufs over wl_shm, and not needing any changes to Weston or Mesa
AFAIU.

Also note that not all drivers support mmap'ing dmabufs, and mmap'ing
in general is usually not a good thing for gfx buffers. I believe you
would want to avoid mmap when possible.

If you wanted to be truely portable, I guess you might create a library
pair similar to libEGL, where the actual protocol extension would again
be just an internal detail of the library. But the question there is
how would that library bind to rendering in client side and compositing
in the server side.

Where do you want to draw the line?


Thanks,
pq

> 2013/11/27 Jasper St. Pierre <jstpierre@mecheye.net>:
> > Wasn't EGLStreams supposed to solve the use case of passing
> > hardware buffers around in a standard way?
> >
> >
> > On Wed, Nov 27, 2013 at 1:22 PM, Jason Ekstrand
> > <jason@jlekstrand.net> wrote:
> >>
> >>
> >> On Nov 27, 2013 10:53 AM, "Benjamin Gaignard"
> >> <benjamin.gaignard@linaro.org> wrote:
> >> >
> >> > Hi all,
> >> >
> >> > I'm working for Linaro on enabling a zero copy path in GStreamer
> >> > by using dmabuf.
> >> > To make this possible I have patched gst wayland sink to use
> >> > wayland drm protocol:
> >> > https://bugzilla.gnome.org/show_bug.cgi?id=711155
> >> >
> >> > Today wayland drm protocol is limited to Mesa so I have decided
> >> > to move it into wayland-core.
> >> > My hardware doesn't have gpu support yet so I have patched weston
> >> > (pixman) to allow usage of wl_drm buffers.
> >> > With this I able to share/use a buffer allocated by DRM in
> >> > gstreamer pipeline even if I don't have gpu and EGL.
> >> >
> >> > What do you think about make wayland drm protocol available like
> >> > this ?
> >>
> >> Benjamin,
> >>
> >> The problem here is that wl_drm is really a mesa extension.  Well,
> >> more of an open-source linux graphics stack extension.  The point
> >> is that there are other graphics stacks: Rhaspberry Pi, libhybris,
> >> other proprietary stacks, etc.  and each of these graphics stacks
> >> has its own extension for passing hardware buffers around.  This
> >> means that if you want your GStreamer sink to work on these other
> >> stacks with zero-copy, you will have to talk their protocols.
> >> Because wl_drm isn't global to all of wayland, it probably
> >> shouldn't go into the wayland core.
> >>
> >> This does not mean, however, that wl_drm can't be exposed in a more
> >> sensible way.  As of 1.3, we are now exporting wayland.xml to
> >> /usr/share/wayland and we can put other extensions there as well.
> >> We could have, for instance, a /usr/share/mesa.xml file that
> >> provides the mesa extensions.  Then projects wanting to talk
> >> directly to mesa can generate the header and C files from the
> >> system-installed xml file.  This would solve the problem of
> >> keeping everything in sync.
> >>
> >> One last note (this one's been bugging me for a while).  If we are
> >> going to export wl_drm in some way, we should probably rename it
> >> to something like mesa_drm.  We really need to get out of the
> >> habit of using the wl_ namespace for everything that talks the
> >> wayland protocol.  If we don't alter the details of wl_drm in the
> >> rename, it shouldn't be too hard to move everyone over from wl_drm
> >> to mesa_drm.
> >>
> >> Hope that's sensible/helpful.
> >> --Jason Ekstrand
> >>
> >>
> >> _______________________________________________
> >> wayland-devel mailing list
> >> wayland-devel@lists.freedesktop.org
> >> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
> >>
> >
> >
> >
> > --
> >   Jasper
> 
> 
>
Daniel Stone Nov. 28, 2013, 8:55 p.m. UTC | #2 
Hi,

On 28 November 2013 10:04, Pekka Paalanen <ppaalanen@gmail.com> wrote:
> On Thu, 28 Nov 2013 10:24:33 +0100
> Benjamin Gaignard <benjamin.gaignard@linaro.org> wrote:
>> From my point of view wl_drm isn't link to Mesa, it is only about
>> exchange buffers by using a file descriptor and, for example, doesn't
>> rely on EGL.
>>
>> I understand that other graphic stacks could have defined their own
>> way to for zero-copy (and so other protocols).
>> I don't aim to make gstreamer wayland sink works for all of them but
>> at least with wl_drm protocol which is quite generic.
>>
>> Since dmabuf has been adopted in kernel we have the opportunity to
>> rationalize also some code in userland and for that we need a common
>> wayland protocol.
>> Move wl_drm into wayland-core make it more easily accessible for all
>> software even for those who don't use Mesa.
>
> if you aim particularly for dma-buf, then I would propose making a new
> Wayland protocol extension mesa_dma_buf or gbm_dma_buf or whatever name
> is appropriate, and drop all the unneeded parts compared to wl_drm.

Given that dmabuf doesn't specify format codes or anything like that,
you can't make it properly generic.  My original thought was to make a
generic wl_dmabuf interface, but given the format code issue, it
seemed prudent to leave it as a part of wl_drm for now.

Cheers,
Daniel
diff mbox

Patch

From fe24018437529affead57dcdf1d9425f11f2c6dd Mon Sep 17 00:00:00 2001
From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Date: Thu, 28 Nov 2013 09:55:38 +0100
Subject: [PATCH] Move wayland-drm protocol from mesa to wayland-core.

Add WL_EXPORT to function declaration.
Add {get/put}_data callback to get access to memory.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
 protocol/Makefile.am     |    6 +-
 protocol/wayland-drm.xml |  182 ++++++++++++++++++++++
 src/Makefile.am          |   11 +-
 src/wayland-drm.c        |  377 ++++++++++++++++++++++++++++++++++++++++++++++
 src/wayland-drm.h        |  131 ++++++++++++++++
 5 files changed, 703 insertions(+), 4 deletions(-)
 create mode 100644 protocol/wayland-drm.xml
 create mode 100644 src/wayland-drm.c
 create mode 100644 src/wayland-drm.h

diff --git a/protocol/Makefile.am b/protocol/Makefile.am
index e8b6290..836e8dd 100644
--- a/protocol/Makefile.am
+++ b/protocol/Makefile.am
@@ -1,4 +1,4 @@ 
-dist_pkgdata_DATA = wayland.xml wayland.dtd
+dist_pkgdata_DATA = wayland.xml wayland-drm.xml wayland.dtd
 
 if HAVE_XMLLINT
 .PHONY: validate
@@ -6,9 +6,9 @@  if HAVE_XMLLINT
 .%.xml.valid: %.xml
 	$(AM_V_GEN)$(XMLLINT) --noout --dtdvalid $(srcdir)/wayland.dtd $^ > $@
 
-validate: .wayland.xml.valid
+validate: .wayland.xml.valid .wayland-drm.xml.valid
 
 all-local: validate
 
-CLEANFILES = .wayland.xml.valid
+CLEANFILES = .wayland.xml.valid .wayland-drm.xml.valid
 endif
diff --git a/protocol/wayland-drm.xml b/protocol/wayland-drm.xml
new file mode 100644
index 0000000..8a3ad69
--- /dev/null
+++ b/protocol/wayland-drm.xml
@@ -0,0 +1,182 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="drm">
+
+  <copyright>
+    Copyright © 2008-2011 Kristian Høgsberg
+    Copyright © 2010-2011 Intel Corporation
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that\n the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+    THIS SOFTWARE.
+  </copyright>
+
+  <!-- drm support. This object is created by the server and published
+       using the display's global event. -->
+  <interface name="wl_drm" version="2">
+    <enum name="error">
+      <entry name="authenticate_fail" value="0"/>
+      <entry name="invalid_format" value="1"/>
+      <entry name="invalid_name" value="2"/>
+    </enum>
+
+    <enum name="format">
+      <!-- The drm format codes match the #defines in drm_fourcc.h.
+           The formats actually supported by the compositor will be
+           reported by the format event. -->
+      <entry name="c8" value="0x20203843"/>
+      <entry name="rgb332" value="0x38424752"/>
+      <entry name="bgr233" value="0x38524742"/>
+      <entry name="xrgb4444" value="0x32315258"/>
+      <entry name="xbgr4444" value="0x32314258"/>
+      <entry name="rgbx4444" value="0x32315852"/>
+      <entry name="bgrx4444" value="0x32315842"/>
+      <entry name="argb4444" value="0x32315241"/>
+      <entry name="abgr4444" value="0x32314241"/>
+      <entry name="rgba4444" value="0x32314152"/>
+      <entry name="bgra4444" value="0x32314142"/>
+      <entry name="xrgb1555" value="0x35315258"/>
+      <entry name="xbgr1555" value="0x35314258"/>
+      <entry name="rgbx5551" value="0x35315852"/>
+      <entry name="bgrx5551" value="0x35315842"/>
+      <entry name="argb1555" value="0x35315241"/>
+      <entry name="abgr1555" value="0x35314241"/>
+      <entry name="rgba5551" value="0x35314152"/>
+      <entry name="bgra5551" value="0x35314142"/>
+      <entry name="rgb565" value="0x36314752"/>
+      <entry name="bgr565" value="0x36314742"/>
+      <entry name="rgb888" value="0x34324752"/>
+      <entry name="bgr888" value="0x34324742"/>
+      <entry name="xrgb8888" value="0x34325258"/>
+      <entry name="xbgr8888" value="0x34324258"/>
+      <entry name="rgbx8888" value="0x34325852"/>
+      <entry name="bgrx8888" value="0x34325842"/>
+      <entry name="argb8888" value="0x34325241"/>
+      <entry name="abgr8888" value="0x34324241"/>
+      <entry name="rgba8888" value="0x34324152"/>
+      <entry name="bgra8888" value="0x34324142"/>
+      <entry name="xrgb2101010" value="0x30335258"/>
+      <entry name="xbgr2101010" value="0x30334258"/>
+      <entry name="rgbx1010102" value="0x30335852"/>
+      <entry name="bgrx1010102" value="0x30335842"/>
+      <entry name="argb2101010" value="0x30335241"/>
+      <entry name="abgr2101010" value="0x30334241"/>
+      <entry name="rgba1010102" value="0x30334152"/>
+      <entry name="bgra1010102" value="0x30334142"/>
+      <entry name="yuyv" value="0x56595559"/>
+      <entry name="yvyu" value="0x55595659"/>
+      <entry name="uyvy" value="0x59565955"/>
+      <entry name="vyuy" value="0x59555956"/>
+      <entry name="ayuv" value="0x56555941"/>
+      <entry name="nv12" value="0x3231564e"/>
+      <entry name="nv21" value="0x3132564e"/>
+      <entry name="nv16" value="0x3631564e"/>
+      <entry name="nv61" value="0x3136564e"/>
+      <entry name="yuv410" value="0x39565559"/>
+      <entry name="yvu410" value="0x39555659"/>
+      <entry name="yuv411" value="0x31315559"/>
+      <entry name="yvu411" value="0x31315659"/>
+      <entry name="yuv420" value="0x32315559"/>
+      <entry name="yvu420" value="0x32315659"/>
+      <entry name="yuv422" value="0x36315559"/>
+      <entry name="yvu422" value="0x36315659"/>
+      <entry name="yuv444" value="0x34325559"/>
+      <entry name="yvu444" value="0x34325659"/>
+    </enum>
+
+    <!-- Call this request with the magic received from drmGetMagic().
+         It will be passed on to the drmAuthMagic() or
+         DRIAuthConnection() call.  This authentication must be
+         completed before create_buffer could be used. -->
+    <request name="authenticate">
+      <arg name="id" type="uint"/>
+    </request>
+
+    <!-- Create a wayland buffer for the named DRM buffer.  The DRM
+         surface must have a name using the flink ioctl -->
+    <request name="create_buffer">
+      <arg name="id" type="new_id" interface="wl_buffer"/>
+      <arg name="name" type="uint"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="stride" type="uint"/>
+      <arg name="format" type="uint"/>
+    </request>
+
+    <!-- Create a wayland buffer for the named DRM buffer.  The DRM
+         surface must have a name using the flink ioctl -->
+    <request name="create_planar_buffer">
+      <arg name="id" type="new_id" interface="wl_buffer"/>
+      <arg name="name" type="uint"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="format" type="uint"/>
+      <arg name="offset0" type="int"/>
+      <arg name="stride0" type="int"/>
+      <arg name="offset1" type="int"/>
+      <arg name="stride1" type="int"/>
+      <arg name="offset2" type="int"/>
+      <arg name="stride2" type="int"/>
+    </request>
+
+    <!-- Create a wayland buffer for the prime fd.  Use for regular and planar
+         buffers.  Pass 0 for offset and stride for unused planes. -->
+    <request name="create_prime_buffer" since="2">
+      <arg name="id" type="new_id" interface="wl_buffer"/>
+      <arg name="name" type="fd"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="format" type="uint"/>
+      <arg name="offset0" type="int"/>
+      <arg name="stride0" type="int"/>
+      <arg name="offset1" type="int"/>
+      <arg name="stride1" type="int"/>
+      <arg name="offset2" type="int"/>
+      <arg name="stride2" type="int"/>
+    </request>
+
+    <!-- Notification of the path of the drm device which is used by
+         the server.  The client should use this device for creating
+         local buffers.  Only buffers created from this device should
+         be be passed to the server using this drm object's
+         create_buffer request. -->
+    <event name="device">
+      <arg name="name" type="string"/>
+    </event>
+
+    <event name="format">
+      <arg name="format" type="uint"/>
+    </event>
+
+    <!-- Raised if the authenticate request succeeded -->
+    <event name="authenticated"/>
+
+    <enum name="capability" since="2">
+      <description summary="wl_drm capability bitmask">
+        Bitmask of capabilities.
+      </description>
+      <entry name="prime" value="1" summary="wl_drm prime available"/>
+    </enum>
+
+    <event name="capabilities">
+      <arg name="value" type="uint"/>
+    </event>
+  </interface>
+
+</protocol>
diff --git a/src/Makefile.am b/src/Makefile.am
index 15f44a5..250906c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,11 @@  noinst_LTLIBRARIES = libwayland-util.la
 include_HEADERS =				\
 	wayland-util.h				\
 	wayland-server-protocol.h		\
+	wayland-drm-server-protocol.h 	\
 	wayland-server.h			\
+	wayland-drm.h 				\
 	wayland-client-protocol.h		\
+	wayland-drm-client-protocol.h 	\
 	wayland-client.h			\
 	wayland-egl.h				\
 	wayland-version.h
@@ -22,14 +25,17 @@  libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
 libwayland_server_la_LDFLAGS = -version-info 1:0:1
 libwayland_server_la_SOURCES =			\
 	wayland-protocol.c			\
+	wayland-drm-protocol.c 		\
 	wayland-server.c			\
 	wayland-shm.c				\
+	wayland-drm.c 				\
 	event-loop.c
 
 libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-util.la -lrt -lm
 libwayland_client_la_LDFLAGS = -version-info 2:0:2
 libwayland_client_la_SOURCES =			\
 	wayland-protocol.c			\
+	wayland-drm-protocol.c  	\
 	wayland-client.c
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -65,7 +71,10 @@  endif
 BUILT_SOURCES =					\
 	wayland-server-protocol.h		\
 	wayland-client-protocol.h		\
-	wayland-protocol.c
+	wayland-protocol.c 				\
+	wayland-drm-server-protocol.h 	\
+	wayland-drm-client-protocol.h 	\
+	wayland-drm-protocol.c
 
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = wayland-version.h
diff --git a/src/wayland-drm.c b/src/wayland-drm.c
new file mode 100644
index 0000000..b5ce07f
--- /dev/null
+++ b/src/wayland-drm.c
@@ -0,0 +1,377 @@ 
+/*
+ * Copyright © 2011 Kristian Høgsberg
+ * Copyright © 2011 Benjamin Franzke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kristian Høgsberg <krh@bitplanet.net>
+ *    Benjamin Franzke <benjaminfranzke@googlemail.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>
+#include <unistd.h>
+
+#include "wayland-server.h"
+#include "wayland-drm.h"
+#include "wayland-drm-server-protocol.h"
+
+#define MIN(x,y) (((x)<(y))?(x):(y))
+
+struct wl_drm {
+	struct wl_display *display;
+	struct wl_global *wl_drm_global;
+
+	void *user_data;
+	char *device_name;
+	uint32_t flags;
+
+	struct wayland_drm_callbacks *callbacks;
+
+	struct wl_buffer_interface buffer_interface;
+};
+
+static void
+destroy_buffer(struct wl_resource *resource)
+{
+	struct wl_drm_buffer *buffer = resource->data;
+	struct wl_drm *drm = buffer->drm;
+
+	drm->callbacks->release_buffer(drm->user_data, buffer);
+	free(buffer);
+}
+
+static void
+buffer_destroy(struct wl_client *client, struct wl_resource *resource)
+{
+	wl_resource_destroy(resource);
+}
+
+static void
+create_buffer(struct wl_client *client, struct wl_resource *resource,
+              uint32_t id, uint32_t name, int fd,
+              int32_t width, int32_t height,
+              uint32_t format,
+              int32_t offset0, int32_t stride0,
+              int32_t offset1, int32_t stride1,
+              int32_t offset2, int32_t stride2)
+{
+	struct wl_drm *drm = resource->data;
+	struct wl_drm_buffer *buffer;
+
+	buffer = calloc(1, sizeof *buffer);
+	if (buffer == NULL) {
+		wl_resource_post_no_memory(resource);
+		return;
+	}
+
+	buffer->drm = drm;
+	buffer->width = width;
+	buffer->height = height;
+	buffer->format = format;
+	buffer->offset[0] = offset0;
+	buffer->stride[0] = stride0;
+	buffer->offset[1] = offset1;
+	buffer->stride[1] = stride1;
+	buffer->offset[2] = offset2;
+	buffer->stride[2] = stride2;
+
+	drm->callbacks->reference_buffer(drm->user_data, name, fd, buffer);
+	if (buffer->driver_buffer == NULL) {
+		wl_resource_post_error(resource,
+				       WL_DRM_ERROR_INVALID_NAME,
+				       "invalid name");
+		return;
+	}
+
+	buffer->resource =
+		wl_resource_create(client, &wl_buffer_interface, 1, id);
+	if (!buffer->resource) {
+		wl_resource_post_no_memory(resource);
+		free(buffer);
+		return;
+	}
+
+	wl_resource_set_implementation(buffer->resource,
+				       (void (**)(void)) &drm->buffer_interface,
+				       buffer, destroy_buffer);
+}
+
+static void
+drm_create_buffer(struct wl_client *client, struct wl_resource *resource,
+		  uint32_t id, uint32_t name, int32_t width, int32_t height,
+		  uint32_t stride, uint32_t format)
+{
+    switch (format) {
+		case WL_DRM_FORMAT_ARGB8888:
+        case WL_DRM_FORMAT_XRGB8888:
+        case WL_DRM_FORMAT_YUYV:
+        case WL_DRM_FORMAT_RGB565:
+			break;
+        default:
+                wl_resource_post_error(resource,
+                                       WL_DRM_ERROR_INVALID_FORMAT,
+                                       "invalid format");
+			return;
+    }
+
+    create_buffer(client, resource, id,
+		name, -1, width, height, format, 0, stride, 0, 0, 0, 0);
+}
+
+static void
+drm_create_planar_buffer(struct wl_client *client,
+                         struct wl_resource *resource,
+                         uint32_t id, uint32_t name,
+                         int32_t width, int32_t height, uint32_t format,
+                         int32_t offset0, int32_t stride0,
+                         int32_t offset1, int32_t stride1,
+                         int32_t offset2, int32_t stride2)
+{
+    switch (format) {
+		case WL_DRM_FORMAT_YUV410:
+		case WL_DRM_FORMAT_YUV411:
+		case WL_DRM_FORMAT_YUV420:
+		case WL_DRM_FORMAT_YUV422:
+		case WL_DRM_FORMAT_YUV444:
+		case WL_DRM_FORMAT_NV12:
+		case WL_DRM_FORMAT_NV16:
+			break;
+        default:
+                wl_resource_post_error(resource,
+                                       WL_DRM_ERROR_INVALID_FORMAT,
+                                       "invalid format");
+			return;
+    }
+
+    create_buffer(client, resource, id, name, -1, width, height, format,
+		offset0, stride0, offset1, stride1, offset2, stride2);
+}
+
+static void
+drm_create_prime_buffer(struct wl_client *client,
+                        struct wl_resource *resource,
+                        uint32_t id, int fd,
+                        int32_t width, int32_t height, uint32_t format,
+                        int32_t offset0, int32_t stride0,
+                        int32_t offset1, int32_t stride1,
+                        int32_t offset2, int32_t stride2)
+{
+    create_buffer(client, resource, id, 0, fd, width, height, format,
+                      offset0, stride0, offset1, stride1, offset2, stride2);
+    close(fd);
+}
+
+static void
+drm_authenticate(struct wl_client *client,
+		 struct wl_resource *resource, uint32_t id)
+{
+	struct wl_drm *drm = resource->data;
+
+	if (drm->callbacks->authenticate(drm->user_data, id) < 0)
+		wl_resource_post_error(resource,
+				       WL_DRM_ERROR_AUTHENTICATE_FAIL,
+				       "authenicate failed");
+	else
+		wl_resource_post_event(resource, WL_DRM_AUTHENTICATED);
+}
+
+static const struct wl_drm_interface drm_interface = {
+	drm_authenticate,
+	drm_create_buffer,
+    drm_create_planar_buffer,
+    drm_create_prime_buffer
+};
+
+static void
+bind_drm(struct wl_client *client, void *data, uint32_t version, uint32_t id)
+{
+	struct wl_drm *drm = data;
+	struct wl_resource *resource;
+	uint32_t capabilities;
+
+	resource = wl_resource_create(client, &wl_drm_interface,
+				      MIN(version, 2), id);
+	if (!resource) {
+		wl_client_post_no_memory(client);
+		return;
+	}
+
+	wl_resource_set_implementation(resource, &drm_interface, data, NULL);
+
+	wl_resource_post_event(resource, WL_DRM_DEVICE, drm->device_name);
+	wl_resource_post_event(resource, WL_DRM_FORMAT,
+			       WL_DRM_FORMAT_ARGB8888);
+	wl_resource_post_event(resource, WL_DRM_FORMAT,
+			       WL_DRM_FORMAT_XRGB8888);
+	wl_resource_post_event(resource, WL_DRM_FORMAT,
+                               WL_DRM_FORMAT_RGB565);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV410);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV411);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV420);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV422);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUV444);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_NV12);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_NV16);
+    wl_resource_post_event(resource, WL_DRM_FORMAT, WL_DRM_FORMAT_YUYV);
+
+    capabilities = 0;
+    if (drm->flags & WAYLAND_DRM_PRIME)
+        capabilities |= WL_DRM_CAPABILITY_PRIME;
+
+    if (version >= 2)
+        wl_resource_post_event(resource, WL_DRM_CAPABILITIES, capabilities);
+}
+
+struct wl_drm_buffer *
+wayland_drm_buffer_get(struct wl_drm *drm, struct wl_resource *resource)
+{
+	if (resource == NULL)
+		return NULL;
+
+    if (wl_resource_instance_of(resource, &wl_buffer_interface,
+                                    &drm->buffer_interface))
+		return wl_resource_get_user_data(resource);
+    else
+		return NULL;
+}
+
+WL_EXPORT struct wl_drm *
+wayland_drm_init(struct wl_display *display, char *device_name,
+                 struct wayland_drm_callbacks *callbacks, void *user_data,
+                 uint32_t flags)
+{
+	struct wl_drm *drm;
+
+	drm = malloc(sizeof *drm);
+
+	drm->display = display;
+	drm->device_name = strdup(device_name);
+	drm->callbacks = callbacks;
+	drm->user_data = user_data;
+    drm->flags = flags;
+
+    drm->buffer_interface.destroy = buffer_destroy;
+
+	drm->wl_drm_global =
+		wl_global_create(display, &wl_drm_interface, 2,
+				 drm, bind_drm);
+
+	return drm;
+}
+
+WL_EXPORT void
+wayland_drm_uninit(struct wl_drm *drm)
+{
+	free(drm->device_name);
+
+	wl_global_destroy(drm->wl_drm_global);
+
+	free(drm);
+}
+
+WL_EXPORT int
+wayland_buffer_is_drm(struct wl_drm_buffer *buffer)
+{
+	struct wl_drm *drm = buffer->drm;
+
+	return wl_resource_instance_of(buffer->resource,
+			&wl_buffer_interface, &drm->buffer_interface);
+}
+
+WL_EXPORT uint32_t
+wayland_drm_buffer_get_format(struct wl_drm_buffer *buffer)
+{
+	if (!wayland_buffer_is_drm(buffer))
+		return 0;
+
+	return buffer->format;
+}
+
+WL_EXPORT void *
+wayland_drm_buffer_get_buffer(struct wl_drm_buffer *buffer)
+{
+	return buffer->driver_buffer;
+}
+
+WL_EXPORT int32_t
+wayland_drm_buffer_get_stride(struct wl_drm_buffer *buffer, int idx)
+{
+	if (!wayland_buffer_is_drm(buffer))
+		return 0;
+
+	return buffer->stride[idx];
+}
+
+WL_EXPORT void *
+wayland_drm_buffer_get_data(struct wl_drm_buffer *buffer)
+{
+	struct wl_drm *drm;
+
+	if (!wayland_buffer_is_drm(buffer))
+		return NULL;
+
+	drm = buffer->drm;
+
+	if (drm->callbacks->get_data)
+		return drm->callbacks->get_data(drm->user_data, buffer);
+
+	return NULL;
+}
+
+WL_EXPORT void
+wayland_drm_buffer_put_data(struct wl_drm_buffer *buffer)
+{
+	struct wl_drm *drm;
+
+	if (!wayland_buffer_is_drm(buffer))
+		return;
+
+	drm = buffer->drm;
+
+	if (drm->callbacks->put_data)
+		drm->callbacks->put_data(drm->user_data, buffer);
+
+	return;
+}
+
+
+WL_EXPORT int32_t
+wayland_drm_buffer_get_width(struct wl_drm_buffer *buffer)
+{
+	if (!wayland_buffer_is_drm(buffer))
+		return 0;
+
+	return buffer->width;
+}
+
+WL_EXPORT int32_t
+wayland_drm_buffer_get_height(struct wl_drm_buffer *buffer)
+{
+	if (!wayland_buffer_is_drm(buffer))
+		return 0;
+
+	return buffer->height;
+}
+
diff --git a/src/wayland-drm.h b/src/wayland-drm.h
new file mode 100644
index 0000000..e21d22b
--- /dev/null
+++ b/src/wayland-drm.h
@@ -0,0 +1,131 @@ 
+#ifndef WAYLAND_DRM_H
+#define WAYLAND_DRM_H
+
+#include <wayland-server.h>
+
+#ifndef WL_DRM_FORMAT_ENUM
+#define WL_DRM_FORMAT_ENUM
+enum wl_drm_format {
+	WL_DRM_FORMAT_C8 = 0x20203843,
+	WL_DRM_FORMAT_RGB332 = 0x38424752,
+	WL_DRM_FORMAT_BGR233 = 0x38524742,
+	WL_DRM_FORMAT_XRGB4444 = 0x32315258,
+	WL_DRM_FORMAT_XBGR4444 = 0x32314258,
+	WL_DRM_FORMAT_RGBX4444 = 0x32315852,
+	WL_DRM_FORMAT_BGRX4444 = 0x32315842,
+	WL_DRM_FORMAT_ARGB4444 = 0x32315241,
+	WL_DRM_FORMAT_ABGR4444 = 0x32314241,
+	WL_DRM_FORMAT_RGBA4444 = 0x32314152,
+	WL_DRM_FORMAT_BGRA4444 = 0x32314142,
+	WL_DRM_FORMAT_XRGB1555 = 0x35315258,
+	WL_DRM_FORMAT_XBGR1555 = 0x35314258,
+	WL_DRM_FORMAT_RGBX5551 = 0x35315852,
+	WL_DRM_FORMAT_BGRX5551 = 0x35315842,
+	WL_DRM_FORMAT_ARGB1555 = 0x35315241,
+	WL_DRM_FORMAT_ABGR1555 = 0x35314241,
+	WL_DRM_FORMAT_RGBA5551 = 0x35314152,
+	WL_DRM_FORMAT_BGRA5551 = 0x35314142,
+	WL_DRM_FORMAT_RGB565 = 0x36314752,
+	WL_DRM_FORMAT_BGR565 = 0x36314742,
+	WL_DRM_FORMAT_RGB888 = 0x34324752,
+	WL_DRM_FORMAT_BGR888 = 0x34324742,
+	WL_DRM_FORMAT_XRGB8888 = 0x34325258,
+	WL_DRM_FORMAT_XBGR8888 = 0x34324258,
+	WL_DRM_FORMAT_RGBX8888 = 0x34325852,
+	WL_DRM_FORMAT_BGRX8888 = 0x34325842,
+	WL_DRM_FORMAT_ARGB8888 = 0x34325241,
+	WL_DRM_FORMAT_ABGR8888 = 0x34324241,
+	WL_DRM_FORMAT_RGBA8888 = 0x34324152,
+	WL_DRM_FORMAT_BGRA8888 = 0x34324142,
+	WL_DRM_FORMAT_XRGB2101010 = 0x30335258,
+	WL_DRM_FORMAT_XBGR2101010 = 0x30334258,
+	WL_DRM_FORMAT_RGBX1010102 = 0x30335852,
+	WL_DRM_FORMAT_BGRX1010102 = 0x30335842,
+	WL_DRM_FORMAT_ARGB2101010 = 0x30335241,
+	WL_DRM_FORMAT_ABGR2101010 = 0x30334241,
+	WL_DRM_FORMAT_RGBA1010102 = 0x30334152,
+	WL_DRM_FORMAT_BGRA1010102 = 0x30334142,
+	WL_DRM_FORMAT_YUYV = 0x56595559,
+	WL_DRM_FORMAT_YVYU = 0x55595659,
+	WL_DRM_FORMAT_UYVY = 0x59565955,
+	WL_DRM_FORMAT_VYUY = 0x59555956,
+	WL_DRM_FORMAT_AYUV = 0x56555941,
+	WL_DRM_FORMAT_NV12 = 0x3231564e,
+	WL_DRM_FORMAT_NV21 = 0x3132564e,
+	WL_DRM_FORMAT_NV16 = 0x3631564e,
+	WL_DRM_FORMAT_NV61 = 0x3136564e,
+	WL_DRM_FORMAT_YUV410 = 0x39565559,
+	WL_DRM_FORMAT_YVU410 = 0x39555659,
+	WL_DRM_FORMAT_YUV411 = 0x31315559,
+	WL_DRM_FORMAT_YVU411 = 0x31315659,
+	WL_DRM_FORMAT_YUV420 = 0x32315559,
+	WL_DRM_FORMAT_YVU420 = 0x32315659,
+	WL_DRM_FORMAT_YUV422 = 0x36315559,
+	WL_DRM_FORMAT_YVU422 = 0x36315659,
+	WL_DRM_FORMAT_YUV444 = 0x34325559,
+	WL_DRM_FORMAT_YVU444 = 0x34325659,
+};
+#endif /* WL_DRM_FORMAT_ENUM */
+
+struct wl_drm;
+
+struct wl_drm_buffer {
+	struct wl_resource *resource;
+	struct wl_drm *drm;
+	int32_t width, height;
+	uint32_t format;
+    const void *driver_format;
+    int32_t offset[3];
+    int32_t stride[3];
+	void *driver_buffer;
+};
+
+struct wayland_drm_callbacks {
+	int (*authenticate)(void *user_data, uint32_t id);
+
+    void (*reference_buffer)(void *user_data, uint32_t name, int fd,
+                                 struct wl_drm_buffer *buffer);
+
+	void (*release_buffer)(void *user_data, struct wl_drm_buffer *buffer);
+	void* (*get_data)(void *user_data, struct wl_drm_buffer *buffer);
+	void (*put_data)(void *user_data, struct wl_drm_buffer *buffer);
+};
+
+enum { WAYLAND_DRM_PRIME = 0x01 };
+
+struct wl_drm_buffer *
+wayland_drm_buffer_get(struct wl_drm *drm, struct wl_resource *resource);
+
+struct wl_drm *
+wayland_drm_init(struct wl_display *display, char *device_name,
+		 struct wayland_drm_callbacks *callbacks, void *user_data,
+                 uint32_t flags);
+
+void
+wayland_drm_uninit(struct wl_drm *drm);
+
+int
+wayland_buffer_is_drm(struct wl_drm_buffer *buffer);
+
+uint32_t
+wayland_drm_buffer_get_format(struct wl_drm_buffer *buffer);
+
+void *
+wayland_drm_buffer_get_buffer(struct wl_drm_buffer *buffer);
+
+int32_t
+wayland_drm_buffer_get_stride(struct wl_drm_buffer *buffer_base, int idx);
+
+void *
+wayland_drm_buffer_get_data(struct wl_drm_buffer *buffer_base);
+
+void
+wayland_drm_buffer_put_data(struct wl_drm_buffer *buffer_base);
+
+int32_t
+wayland_drm_buffer_get_width(struct wl_drm_buffer *buffer_base);
+
+int32_t
+wayland_drm_buffer_get_height(struct wl_drm_buffer *buffer_base);
+
+#endif
-- 
1.7.9.5